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

[PATCH v4 1/1] rebase.c: make sure the active branch isn't moved when autostashing

From
Ben Wijen <ben@wijen.net>
Date
Aug 26, 2019, 16:45 UTC
Message-ID
<20190826164513.9102-1-ben@wijen.net>
In-Reply-To
<20190821182941.12674-1-ben@wijen.net>

Dscho's review got me thinking about the rationale behind the 'HEAD is now at...' message.

A 'stash push' is followed by a 'reset -q' but since 'stash create autostash' is not, we must do it ourselves. I guess the legacy implementation could have been 'reset --hard -q' which would have also prevented the 'HEAD is now at...' message.

Ofcourse I'm happy to reinstate the message, but I'm convinced it doesn't add
information, as with this commit the original branch is no longer moved and 
- as before - the autostash is re-applied after the rebase, leaving nothing
to be guessed about.
Thank you,
Ben Wijen (1):
  rebase.c: make sure the active branch isn't moved when autostashing
 builtin/rebase.c            | 18 ++++++------------
 t/t3420-rebase-autostash.sh | 12 ++++++++----
 2 files changed, 14 insertions(+), 16 deletions(-)
-- 
2.22.0
Previous: Junio C HamanoNext: Ben Wijen
Message 13 of 38 in “git rebase: Make sure upstream branch is left alone.”
  1. 0/2 git rebase: Make sure upstream branch is left alone.Ben Wijen, Aug 18, 2019
  2. 2/2 rebase.c: make sure current branch isn't moved when autostashingBen Wijen, Aug 18, 2019
  3. Phillip WoodAug 20, 2019
  4. BenAug 20, 2019
  5. 0/1 git rebase: Make sure upstream branch is left alone.Ben Wijen, Aug 20, 2019
  6. 1/1 rebase.c: make sure current branch isn't moved when autostashingBen Wijen, Aug 20, 2019
  7. Eric SunshineAug 20, 2019
  8. Junio C HamanoAug 20, 2019
  9. 0/1 rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 21, 2019
  10. 1/1 rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 21, 2019
  11. Johannes SchindelinAug 22, 2019
  12. Junio C HamanoAug 22, 2019
  13. 1/1 rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 26, 2019
  14. 1/1 rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 26, 2019
  15. SZEDER GáborAug 26, 2019
  16. Johannes SchindelinAug 28, 2019
  17. Junio C HamanoAug 28, 2019
  18. Junio C HamanoAug 28, 2019
  19. 0/2 rebase.c: make sure current branch isn't moved when autostashingBen Wijen, Aug 29, 2019
  20. 1/2 builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 29, 2019
  21. 2/2 builtin/rebase.c: Remove pointless messageBen Wijen, Aug 29, 2019
  22. 0/2 rebase.c: make sure current branch isn't moved when autostashingBen Wijen, Aug 30, 2019
  23. 1/2 builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen, Aug 30, 2019
  24. Junio C HamanoAug 30, 2019
  25. BenAug 31, 2019
  26. Junio C HamanoSep 1, 2019
  27. BenSep 1, 2019
  28. Junio C HamanoSep 2, 2019
  29. 2/2 builtin/rebase.c: Remove pointless messageBen Wijen, Aug 30, 2019
  30. 2/2 builtin/rebase.c: Remove pointless messageBen Wijen, Aug 30, 2019
  31. Junio C HamanoAug 30, 2019
  32. BenAug 31, 2019
  33. 1/2 t3420: never change upstream branchBen Wijen, Aug 18, 2019
  34. Junio C HamanoAug 19, 2019
  35. Phillip WoodAug 20, 2019
  36. Phillip WoodAug 19, 2019
  37. BenAug 19, 2019
  38. Junio C HamanoAug 19, 2019

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.