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

[PATCH 0/6 v5] allow "-" as a shorthand for "previous branch"

From
Siddharth Kannan <kannan.siddharth12@gmail.com>
Date
Feb 25, 2017, 07:24 UTC
Message-ID
<1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>

An updated version of the patch [1]. Discussion here[1] has been taken into account. The test for "-@{yesterday}" is there inside the log-shorthand test, it is commented out for now.

I have removed the redundant pieces of code in merge.c and revert.c as mentioned by Matthieu in [2]. As analysed by Junio[3], the same type of code inside checkout.c and worktree.c can not be removed because the appropriate functions inside revision.c are not called in their codepaths.

Thanks for your review of the previous versions, Junio and Matthieu!

[1]: 1487258054-32292-1-git-send-email-kannan.siddharth12@gmail.com [2]: vpqbmu768on.fsf@anie.imag.fr [3]: xmqq1sv1euob.fsf@gitster.mtv.corp.google.com

Siddharth Kannan (6):
  revision.c: do not update argv with unknown option
  revision.c: swap if/else blocks
  revision.c: args starting with "-" might be a revision
  sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
  merge.c: delegate handling of "-" shorthand to revision.c:get_sha1
  revert.c: delegate handling of "-" shorthand to setup_revisions
 builtin/merge.c                   |   2 -
 builtin/revert.c                  |   2 -
 revision.c                        |  15 +++---
 sha1_name.c                       |   5 ++
 t/t3035-merge-hyphen-shorthand.sh |  33 ++++++++++++
 t/t3514-revert-shorthand.sh       |  25 +++++++++
 t/t4214-log-shorthand.sh          | 106 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 178 insertions(+), 10 deletions(-)
 create mode 100755 t/t3035-merge-hyphen-shorthand.sh
 create mode 100755 t/t3514-revert-shorthand.sh
 create mode 100755 t/t4214-log-shorthand.sh
-- 
2.1.4
Next: Siddharth Kannan
Message 1 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.