From: Norbert Kiesel <nkiesel@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Elijah Newren <newren@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: "git rebase" behavior change in 2.26.0
Date: Fri, 27 Mar 2020 11:01:30 -0700 [thread overview]
Message-ID: <CAM+g_NtV5iUM=VJHOX7Um2DFLzjq-x76TYa_P_U6q5HBRmCY=A@mail.gmail.com> (raw)
In-Reply-To: <CAM+g_NthmmJh3=Tp3ea6PmDr1h2-WtpiSTO8q02V3judc9p-Kg@mail.gmail.com>
I ran a "pull" today morning w/o sufficient coffee and thus forgot to
disable the "pull.rebase" and was bitten by that again. Here is what
I see when using "GIT_TRACE2=1 git -c pull.rebase=true pull
--ff-only":
...
10:54:50.578673 run-command.c:735 child_start[2] git
merge --ff-only FETCH_HEAD
10:54:50.580385 common-main.c:48 version 2.26.0
10:54:50.580404 common-main.c:49 start
/usr/lib/git-core/git merge --ff-only FETCH_HEAD
10:54:50.580587 repository.c:130 worktree
/home/nkiesel/work/Platform
10:54:50.580785 git.c:440 cmd_name merge (pull/merge)
Already up to date.
10:54:50.589803 git.c:674 exit elapsed:0.009835 code:0
10:54:50.589827 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.009874 code:0
10:54:50.590887 run-command.c:990 child_exit[2]
pid:939370 code:0 elapsed:0.012205
10:54:50.590919 run-command.c:735 child_start[3] git
rebase --onto d0527895a4df44f00162b68011b803e597fd400f
d0527895a4df44f00162b68011b803e597fd400f
10:54:50.592396 common-main.c:48 version 2.26.0
10:54:50.592412 common-main.c:49 start
/usr/lib/git-core/git rebase --onto
d0527895a4df44f00162b68011b803e597fd400f
d0527895a4df44f00162b68011b803e597fd400f
10:54:50.592568 repository.c:130 worktree
/home/nkiesel/work/Platform
10:54:50.592714 git.c:440 cmd_name rebase (pull/rebase)
10:54:50.593142 builtin/rebase.c:1669 cmd_mode undefined
10:54:50.614154 run-command.c:735 child_start[0] git
checkout d0527895a4df44f00162b68011b803e597fd400f
10:54:50.678813 run-command.c:990 child_exit[0]
pid:939392 code:0 elapsed:0.064656
Successfully rebased and updated refs/heads/nextrelease.
10:54:50.697724 git.c:674 exit elapsed:0.105715 code:0
10:54:50.697734 trace2/tr2_tgt_normal.c:123 atexit elapsed:0.105729 code:0
10:54:50.698307 run-command.c:990 child_exit[3]
pid:939371 code:0 elapsed:0.107373
10:54:50.698343 git.c:674 exit elapsed:5.904200 code:0
10:54:50.698354 trace2/tr2_tgt_normal.c:123 atexit elapsed:5.904211 code:0
I would argue that "--ff-only" would mean to never rebase, but clearly
git runs a rebase of HEAD onto HEAD and i assume by that setting
ORIG_HEAD to HEAD as colloquial damage.
next prev parent reply other threads:[~2020-03-27 18:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 3:38 "git rebase" behavior change in 2.26.0 Norbert Kiesel
2020-03-25 5:39 ` Jeff King
2020-03-25 21:21 ` Elijah Newren
[not found] ` <CAM+g_NtHC5ukU3jchVfud_H_m_h29UQ8vmwQoND8s_Q9Hv70Fg@mail.gmail.com>
2020-03-26 1:37 ` Norbert Kiesel
2020-03-26 1:46 ` Norbert Kiesel
2020-03-26 3:37 ` Elijah Newren
2020-03-26 6:32 ` Elijah Newren
2020-03-26 7:28 ` Jeff King
[not found] ` <CAM+g_NthmmJh3=Tp3ea6PmDr1h2-WtpiSTO8q02V3judc9p-Kg@mail.gmail.com>
2020-03-27 18:01 ` Norbert Kiesel [this message]
2020-03-27 18:34 ` Elijah Newren
2020-03-27 20:59 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAM+g_NtV5iUM=VJHOX7Um2DFLzjq-x76TYa_P_U6q5HBRmCY=A@mail.gmail.com' \
--to=nkiesel@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).