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

Re: [PATCH 6/6 v5] revert.c: delegate handling of "-" shorthand to setup_revisions

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 1, 2017, 23:18 UTC
Message-ID
<xmqqa894egbj.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1488007487-12965-7-git-send-email-kannan.siddharth12@gmail.com>
Siddharth Kannan <kannan.siddharth12@gmail.com> writes:
Show 7 quoted lines
> revert.c:run_sequencer calls setup_revisions right after replacing "-" with
> "@{-1}" for this shorthand. A previous patch taught setup_revisions to handle
> this shorthand by doing the required replacement inside revision.c:get_sha1_1.
>
> Hence, the code here is redundant and has been removed.
>
> This patch also adds a test to check that revert recognizes the "-" shorthand.

Unlike "merge" [*1*], I think this one is OK because "git revert $commit" does not try to say _how_ the commit was given, and most importantly, it does not say what branch the reverted thing was.

Thanks.
[Footnote]
*1* Probably "checkout" would exhibit the same issue as we saw in
    5/6 for "git merge" if you remove the "- to @{-1}" conversion
    from it.
Previous: Siddharth KannanNext: Siddharth Kannan
Message 4 of 12 in “allow "-" as a shorthand for "previous branch"”
  1. 0/6 allow "-" as a shorthand for "previous branch"Siddharth Kannan, Feb 25, 2017
  2. 3/6 revision.c: args starting with "-" might be a revisionSiddharth Kannan, Feb 25, 2017
  3. 6/6 revert.c: delegate handling of "-" shorthand to setup_revisionsSiddharth Kannan, Feb 25, 2017
  4. Junio C HamanoMar 1, 2017
  5. 5/6 merge.c: delegate handling of "-" shorthand to revision.c:get_sha1Siddharth Kannan, Feb 25, 2017
  6. Junio C HamanoMar 1, 2017
  7. Junio C HamanoMar 1, 2017
  8. 4/6 sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"Siddharth Kannan, Feb 25, 2017
  9. 6/6 sha1_name.c: avoid parsing @{-1} unnecessarilymash, Mar 14, 2017
  10. 2/6 revision.c: swap if/else blocksSiddharth Kannan, Feb 25, 2017
  11. 1/6 revision.c: do not update argv with unknown optionSiddharth Kannan, Feb 25, 2017
  12. 1/6 revision.c: do not update argv with unknown optionSiddharth Kannan, Feb 25, 2017

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.