From: "Rubén Justo via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Rubén Justo" <rjusto@gmail.com>,
"Rubén Justo" <rjusto@gmail.com>, rjusto <rjusto@gmail.com>
Subject: [PATCH v2] allow "-" as short-hand for "@{-1}" in "branch -d"
Date: Tue, 16 Aug 2022 17:11:51 +0000 [thread overview]
Message-ID: <pull.1315.v2.git.1660669912043.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1315.git.1659910949556.gitgitgadget@gmail.com>
From: rjusto <rjusto@gmail.com>
Align "branch -d" with the intuitive use of "-" as a short-hand
for "@{-1}", like in "checkout", "rebase" and "merge" commands.
$ git branch -d - # short-hand for: "git branch -d @{-1}"
$ git branch -D - # short-hand for: "git branch -D @{-1}"
So I can do:
$ git checkout work_to_review
$ git checkout -
$ git merge - # or git rebase -
$ git branch -d -
Signed-off-by: rjusto <rjusto@gmail.com>
---
branch: allow "-" as a short-hand for "previous branch"
Align "branch" with the intuitive use of "-" as a short-hand for
"@{-1}", like in "checkout" and "merge" commands.
$ git branch -d - # short-hand for: "git branch -d @{-1}" $ git branch
-D - # short-hand for: "git branch -D @{-1}"
Signed-off-by: rjusto rjusto@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1315%2Frjusto%2Fmaster-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1315/rjusto/master-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1315
Range-diff vs v1:
1: 3ba75097ea0 ! 1: 0fe48ada15b branch: allow "-" as a short-hand for "previous branch"
@@ Metadata
Author: rjusto <rjusto@gmail.com>
## Commit message ##
- branch: allow "-" as a short-hand for "previous branch"
+ allow "-" as short-hand for "@{-1}" in "branch -d"
- Align "branch" with the intuitive use of "-" as a short-hand
- for "@{-1}", like in "checkout" and "merge" commands.
+ Align "branch -d" with the intuitive use of "-" as a short-hand
+ for "@{-1}", like in "checkout", "rebase" and "merge" commands.
$ git branch -d - # short-hand for: "git branch -d @{-1}"
$ git branch -D - # short-hand for: "git branch -D @{-1}"
+ So I can do:
+
+ $ git checkout work_to_review
+ $ git checkout -
+ $ git merge - # or git rebase -
+ $ git branch -d -
+
Signed-off-by: rjusto <rjusto@gmail.com>
## builtin/branch.c ##
@@ builtin/branch.c: static int delete_branches(int argc, const char **argv, int fo
die(_("Couldn't look up commit object for HEAD"));
}
-+ if ((argc == 1) && !strcmp(argv[0], "-")) {
++ if ((argc == 1) && !strcmp(argv[0], "-"))
+ argv[0] = "@{-1}";
-+ }
+
for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
char *target = NULL;
builtin/branch.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index 55cd9a6e998..7f7589bd4a8 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -241,6 +241,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
die(_("Couldn't look up commit object for HEAD"));
}
+ if ((argc == 1) && !strcmp(argv[0], "-"))
+ argv[0] = "@{-1}";
+
for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
char *target = NULL;
int flags = 0;
base-commit: 679aad9e82d0dfd8ef3d1f98fa4629665496cec9
--
gitgitgadget
next prev parent reply other threads:[~2022-08-16 17:12 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
2022-08-19 11:42 ` Johannes Schindelin
2022-08-16 17:11 ` Rubén Justo via GitGitGadget [this message]
2022-08-16 18:55 ` [PATCH v2] allow "-" as short-hand for "@{-1}" in "branch -d" 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=pull.1315.v2.git.1660669912043.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=rjusto@gmail.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).