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

Re: [PATCH v2 6/7] rebase: write better reflog messages

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Jun 19, 2013, 05:39 UTC
Message-ID
<51C1442A.2010904@viscovery.net>
In-Reply-To
<1371581737-10013-7-git-send-email-artagnon@gmail.com>
Am 6/18/2013 20:55, schrieb Ramkumar Ramachandra:
Show 10 quoted lines
> Now that the "checkout" invoked internally from "rebase" knows to honor
> GIT_REFLOG_ACTION, we can start to use it to write a better reflog
> message when "rebase anotherbranch", "rebase --onto branch",
> etc. internally checks out the new fork point.  We will write:
> 
>   rebase: checkout master
> 
> instead of the old
> 
>   rebase
Show 9 quoted lines
> diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> index 34e3102..69fae7a 100644
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> @@ -5,11 +5,13 @@
>  
>  case "$action" in
>  continue)
> +	GIT_REFLOG_ACTION="$base_reflog_action"

I haven't followed the topic closely, but I wonder why there are so many explicit assignments to GIT_REFLOG_ACTION. Is calling set_reflog_action (defined in git-sh-setup) the wrong thing to do?

-- Hannes
Previous: Junio C HamanoNext: Ramkumar Ramachandra
Message 9 of 19 in “Re-roll rr/rebase-checkout-reflog”
  1. 0/7 Re-roll rr/rebase-checkout-reflogRamkumar Ramachandra, Jun 18, 2013
  2. 1/7 t/t7512-status-help: test "HEAD detached from"Ramkumar Ramachandra, Jun 18, 2013
  3. 2/7 wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra, Jun 18, 2013
  4. 3/7 t/t2012-checkout-last: test "checkout -" after a rebaseRamkumar Ramachandra, Jun 18, 2013
  5. 4/7 status: do not depend on rebase reflog messagesRamkumar Ramachandra, Jun 18, 2013
  6. 5/7 checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra, Jun 18, 2013
  7. 6/7 rebase: write better reflog messagesRamkumar Ramachandra, Jun 18, 2013
  8. Junio C HamanoJun 18, 2013
  9. Johannes SixtJun 19, 2013
  10. Ramkumar RamachandraJun 19, 2013
  11. Johannes SixtJun 19, 2013
  12. Junio C HamanoJun 19, 2013
  13. Junio C HamanoJun 19, 2013
  14. Junio C HamanoJun 19, 2013
  15. 7/7 rebase -i: write better reflog messagesRamkumar Ramachandra, Jun 18, 2013
  16. Junio C HamanoJun 18, 2013
  17. Ramkumar RamachandraJun 18, 2013
  18. Junio C HamanoJun 18, 2013
  19. Ramkumar RamachandraJun 19, 2013

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.