git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: "git rebase" behavior change in 2.26.0

From
NKNorbert Kiesel <nkiesel@gmail.com>
Date
Mar 27, 2020, 18:01 UTC
Message-ID
<CAM+g_NtV5iUM=VJHOX7Um2DFLzjq-x76TYa_P_U6q5HBRmCY=A@mail.gmail.com>
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.

Previous: Jeff KingNext: Elijah Newren
Message 9 of 11 in “"git rebase" behavior change in 2.26.0”
  1. Norbert KieselMar 25, 2020
  2. Jeff KingMar 25, 2020
  3. Elijah NewrenMar 25, 2020
  4. Norbert KieselMar 26, 2020
  5. Norbert KieselMar 26, 2020
  6. Elijah NewrenMar 26, 2020
  7. Elijah NewrenMar 26, 2020
  8. Jeff KingMar 26, 2020
  9. Norbert KieselMar 27, 2020
  10. Elijah NewrenMar 27, 2020
  11. Elijah NewrenMar 27, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.