From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 359591F516 for ; Thu, 21 Jun 2018 09:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932692AbeFUJms (ORCPT ); Thu, 21 Jun 2018 05:42:48 -0400 Received: from forward4p.cmail.yandex.net ([77.88.31.19]:48552 "EHLO forward4p.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932620AbeFUJmr (ORCPT ); Thu, 21 Jun 2018 05:42:47 -0400 Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward4p.cmail.yandex.net (Yandex) with ESMTP id 537142105B for ; Thu, 21 Jun 2018 12:42:45 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id dPgULQLWY4-giMGGBp4; Thu, 21 Jun 2018 12:42:44 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1529574164; bh=Qx+hBvskauVUmW6pTpi01SZ/EeeRfZ0p+xuCr18O8g8=; h=From:To:In-Reply-To:References:Subject:Date:Message-Id; b=d9eVdCTN/fMTZV12qOCaF9pWKvV9MIa8lPAvAy4pCRsmbv+P8LE5b4bH8NAKX32UA /p8D4LoX0gQT4j3EefZZDV/oDvvkIemXH84gPIuyKdMuGb5nScCxCqZ5HdvkvktWUT aL45tocWM9ll9pLZVMroqKfy3D3vhujnMQKyUsC4= Authentication-Results: mxback12g.mail.yandex.net; dkim=pass header.i=@yandex.ru Received: by web50g.yandex.ru with HTTP; Thu, 21 Jun 2018 12:42:44 +0300 From: KES Envelope-From: kes-kes@yandex.com To: git In-Reply-To: <242401529573355@web55j.yandex.ru> References: <242401529573355@web55j.yandex.ru> Subject: Re: After rebasing and reset I am on unexpected commit MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Thu, 21 Jun 2018 12:42:44 +0300 Message-Id: <268931529574164@web50g.yandex.ru> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org ah, sorry. I understand why. The merge was on remote side. 21.06.2018, 12:37, "KES" : > Hi. > > I am on my current branch: > > $ git log --graph --decorate --pretty=oneline --abbrev-commit > * 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS > * f45a919 Create SCTT for Contractor > * 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement > * 7e4cac9 Create SCTT for Language > * a0607d1 Fixed broken tests for 'Person' > * 1d0a1b2 Create SCTT for DocumentFile > * 92837c1 Fix SQL quoting problem > > Now I want to pull new changes and rebase my work on top of it: > > $ git pull -v -r amazon SCTT_for_other_tables > From amazon:/v1/repos/tucha >  * branch SCTT_for_other_tables -> FETCH_HEAD >  = [up to date] SCTT_for_other_tables -> amazon/SCTT_for_other_tables > Created autostash: 97ce867 > HEAD is now at 5b85d64 Implement script to test CORS > Changes from 5b85d647ecd503cc03b26ed4e33bf8266bc8e96b to a0d92dc11ec11023f6d492497e043170d7128f56: >  lib/MaitreD/Controller/ContractorTypeI18n.pm | 54 +--------------- >  public/maitre_d/api-v1.yaml | 158 ++++++++++++++++++++++++++++++++++++++++++++++- >  t/MaitreD/contractor_type_i18n.t | 117 +++++++++++++++++++++++++++++++++++ >  3 files changed, 276 insertions(+), 53 deletions(-) >  create mode 100644 t/MaitreD/contractor_type_i18n.t > Note: checking out 'a0d92dc11ec11023f6d492497e043170d7128f56'. > > You are in 'detached HEAD' state. You can look around, make experimental > changes and commit them, and you can discard any commits you make in this > state without impacting any branches by performing another checkout. > > If you want to create a new branch to retain commits you create, you may > do so (now or later) by using -b with the checkout command again. Example: > >   git checkout -b > > HEAD is now at a0d92dc Merge branch 'SCTT_for_other_tables' of amazon:/v1/repos/tucha into SCTT_for_other_tables > Rebasing (1/1) >  lib/MaitreD/Controller/ContractorTypeI18n.pm | 54 +-------- >  public/maitre_d/api-v1.yaml | 158 ++++++++++++++++++++++++++- >  t/MaitreD/contractor_type_i18n.t | 117 ++++++++++++++++++++ >  3 files changed, 276 insertions(+), 53 deletions(-) > Successfully rebased and updated refs/heads/SCTT_for_other_tables. > Applying autostash resulted in conflicts. > Your changes are safe in the stash. > You can run "git stash pop" or "git stash drop" at any time. > > As you can see the rebase finished successfully except applying autostash > > $ git log --graph --decorate --pretty=oneline --abbrev-commit > * a0d92dc (HEAD -> SCTT_for_other_tables, amazon/SCTT_for_other_tables) Merge branch 'SCTT_for_oth > |\ > | * 5b85d64 Implement script to test CORS > * | 0c1ac6c Create SCTT for ContractorTypeI18n > |/ > * f45a919 Create SCTT for Contractor > * 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement > * 7e4cac9 Create SCTT for Language > * a0607d1 Fixed broken tests for 'Person' > * 1d0a1b2 Create SCTT for DocumentFile > * 92837c1 Fix SQL quoting problem > > 1. Why I got merge? I did not ask that. Thus I want to rewind back > > $ git reset --hard HEAD^ > HEAD is now at 0c1ac6c Create SCTT for ContractorTypeI18n > > 2. Why I am returned to 0c1ac6c Create SCTT for ContractorTypeI18n > instead of: 5b85d64 Implement script to test CORS ? > > I expect to be in the state when I start my rebasing > > $ git log --graph --decorate --pretty=oneline --abbrev-commit > * 0c1ac6c (HEAD -> SCTT_for_other_tables) Create SCTT for ContractorTypeI18n > * f45a919 Create SCTT for Contractor > * 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement > * 7e4cac9 Create SCTT for Language > * a0607d1 Fixed broken tests for 'Person' > * 1d0a1b2 Create SCTT for DocumentFile > * 92837c1 Fix SQL quoting problem > > Now 5b85d64 Implement script to test CORS is not any branch and with less attention will be lost > > What did I do wrong? is this behavior expected?