From: "Rubén Justo" <rjusto@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Rubén Justo via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] branch: allow "-" as a short-hand for "previous branch"
Date: Tue, 16 Aug 2022 19:03:27 +0200 [thread overview]
Message-ID: <986564d9-4d49-b1ef-e2e0-65d6f67f9e79@gmail.com> (raw)
In-Reply-To: <9so90892-25nr-0s4o-q98n-2qo76r3s89p3@tzk.qr>
Hi Johannes,
On 8/16/22 11:31 AM, Johannes Schindelin wrote:
>> $ git merge - old-branch
>> merge: - - not something we can merge
>
> This is confusing me: how is the patch supporting `git branch -d -`
> aligned with the presented `git merge` invocations?
"merge" supports multiple objects to be specified, but "-" only is
accepted if just one argument is specified, as Junio did it in:
commit 4e8115fff135a09f75020083f51722e7e35eb6e9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Apr 7 15:57:57 2011 -0700
merge: allow "-" as a short-hand for "previous branch"
Just like "git checkout -" is a short-hand for "git checkout @{-1}" to
conveniently switch back to the previous branch, "git merge -" is a
short-hand for "git merge @{-1}" to conveniently merge the previous
branch.
It will allow me to say:
$ git checkout -b au/topic
$ git am -s ./+au-topic.mbox
$ git checkout pu
$ git merge -
which is an extremely typical and repetitive operation during my
git day.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/merge.c b/builtin/merge.c
index d54e7ddbb1..0bdd19a137 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1062,9 +1062,12 @@ int cmd_merge(int argc, const char **argv, const
char *prefix)
if (!allow_fast_forward && fast_forward_only)
die(_("You cannot combine --no-ff with --ff-only."));
- if (!argc && !abort_current_merge && default_to_upstream)
- argc = setup_with_upstream(&argv);
-
+ if (!abort_current_merge) {
+ if (!argc && default_to_upstream)
+ argc = setup_with_upstream(&argv);
+ else if (argc == 1 && !strcmp(argv[0], "-"))
+ argv[0] = "@{-1}";
+ }
if (!argc)
usage_with_options(builtin_merge_usage,
builtin_merge_options);
So I aligned "branch -d" (or "delete-branch") with that.
The other two commands that already support "-", also works the same way:
$ git checkout -B - default
fatal: '-' is not a valid branch name
$ git rebase default -
fatal: no such branch/commit '-'
To summarize, my goal is to allow:
$ git checkout work_to_review
$ git checkout -
$ git merge - # or git rebase -
$ git branch -d -
Makes sense to me...
I've updated the commit message with a more specific message and removed
the braces, jic.
next prev parent reply other threads:[~2022-08-16 17:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 22:22 [PATCH] branch: allow "-" as a short-hand for "previous branch" Rubén Justo via GitGitGadget
2022-08-08 13:26 ` Johannes Schindelin
2022-08-08 16:06 ` Junio C Hamano
2022-08-13 9:19 ` Rubén Justo
2022-08-13 22:28 ` Junio C Hamano
2022-08-16 9:49 ` Johannes Schindelin
2022-08-19 13:05 ` Johannes Schindelin
2022-08-19 18:11 ` Junio C Hamano
2022-08-25 7:57 ` Rubén Justo
2022-08-25 16:23 ` Junio C Hamano
2022-08-25 19:50 ` Rubén Justo
2022-08-13 9:08 ` Rubén Justo
2022-08-08 14:46 ` Junio C Hamano
2022-08-13 9:14 ` Rubén Justo
2022-08-16 9:31 ` Johannes Schindelin
2022-08-16 17:03 ` Rubén Justo [this message]
2022-08-19 11:42 ` Johannes Schindelin
2022-08-16 17:11 ` [PATCH v2] allow "-" as short-hand for "@{-1}" in "branch -d" Rubén Justo via GitGitGadget
2022-08-16 18:55 ` Junio C Hamano
2022-08-16 21:27 ` Rubén Justo
2022-08-16 21:18 ` [PATCH v3] branch: allow "-" as a short-hand for "previous branch" Rubén Justo
2022-09-11 14:14 ` [PATCH v4] branch: allow "-" as a shortcut " Rubén Justo
2022-09-12 17:52 ` Junio C Hamano
2022-09-12 21:18 ` Rubén Justo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=986564d9-4d49-b1ef-e2e0-65d6f67f9e79@gmail.com \
--to=rjusto@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).