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

[PATCH 1/2] builtin/rebase.c: Emit warning when rebasing without a forkpoint

From
Wesley Schwengle <wesleys@opperschaap.net>
Date
Aug 19, 2023, 20:34 UTC
Message-ID
<20230819203528.562156-1-wesleys@opperschaap.net>

A couple of years ago I submitted d1e894c6d7 (Document `rebase.forkpoint` in rebase man page, 2021-09-16) and during that discussion there was some talk about the behaviour of `git rebase'[1]. During that time I found that the documentation update was suffice. I wouldn't say it kept me awake at night but I do think that `git rebase' with or without an upstream supplied should behave the same in regards to forkpoints. This patch series addresses this behaviour change. It introduces a warning so users will have to set `rebase.forkpoint' in their configuration. In the future we can remove the warning and opt to pick `--no-fork-point' as a default value for `git rebase'.

There is one point where I'm a little confused, the `test_cmp' function in the testsuite doesn't like the output that is captured from STDERR, it seems that there is a difference in regards to whitespace. My workaround is to use `diff -wq`. I don't know if this is an accepted solution.

Another point of interest is that `git rebase' outputs `Successfully rebased and updated refs/heads/foo.' on STDERR and when everything is up to date it outputs `Current branch foo is up to date.' on STDOUT. I was a little confused by this. Especially since the output on STDOUT can be compared with `test_cmp'.

[1] https://lore.kernel.org/git/xmqqmtocrxwq.fsf@gitster.g/
Next: Wesley Schwengle
Message 1 of 23 in “builtin/rebase.c: Emit warning when rebasing without a forkpoint”
  1. 1/2 builtin/rebase.c: Emit warning when rebasing without a forkpointWesley Schwengle, Aug 19, 2023
  2. 1/2 builtin/rebase.c: Emit warning when rebasing without a forkpointWesley Schwengle, Aug 19, 2023
  3. Junio C HamanoAug 31, 2023
  4. Junio C HamanoAug 31, 2023
  5. Phillip WoodSep 1, 2023
  6. Junio C HamanoSep 1, 2023
  7. Emit warning when rebasing without a forkpointWesley Schwengle, Sep 2, 2023
  8. 2/3 builtin/rebase.c: Emit warning when rebasing without a forkpointWesley Schwengle, Sep 2, 2023
  9. Junio C HamanoSep 2, 2023
  10. WesleySep 3, 2023
  11. Junio C HamanoSep 3, 2023
  12. Wesley SchwengleSep 3, 2023
  13. Junio C HamanoSep 5, 2023
  14. Phillip WoodSep 4, 2023
  15. 1/3 rebase.c: Make a distiction between rebase.forkpoint and --fork-point argumentsWesley Schwengle, Sep 2, 2023
  16. 3/3 git-rebase.txt: Add deprecation notice to the --fork-point optionsWesley Schwengle, Sep 2, 2023
  17. Phillip WoodSep 1, 2023
  18. WesleySep 1, 2023
  19. Junio C HamanoSep 1, 2023
  20. WesleySep 2, 2023
  21. Junio C HamanoSep 2, 2023
  22. 2/2 git-rebase.txt: Add deprecation notice to the --fork-point optionsWesley Schwengle, Aug 19, 2023
  23. Wesley SchwengleAug 31, 2023

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.