From: Aaron Greenberg <p@aaronjgreenberg.com>
To: peff@peff.net
Cc: git@matthieu-moy.fr, git@vger.kernel.org, p@aaronjgreenberg.com,
gitster@pobox.com
Subject: [PATCH] branch: implement shortcut to delete last branch
Date: Fri, 23 Mar 2018 22:40:35 +0000 [thread overview]
Message-ID: <1521844835-23956-2-git-send-email-p@aaronjgreenberg.com> (raw)
In-Reply-To: <1521844835-23956-1-git-send-email-p@aaronjgreenberg.com>
This patch gives git-branch the ability to delete the previous
checked-out branch using the "-" shortcut. This shortcut already exists
for git-checkout, git-merge, and git-revert. A common workflow is
1. Do some work on a local topic-branch and push it to a remote.
2. 'remote/topic-branch' gets merged in to 'remote/master'.
3. Switch back to local master and fetch 'remote/master'.
4. Delete previously checked-out local topic-branch.
$ git checkout -b topic-a
$ # Do some work...
$ git commit -am "Implement feature A"
$ git push origin topic-a
$ git checkout master
$ git branch -d topic-a
$ # With this patch, a user could simply type
$ git branch -d -
"-" is a useful shortcut for cleaning up a just-merged branch
(or a just switched-from branch.)
Signed-off-by: Aaron Greenberg <p@aaronjgreenberg.com>
---
builtin/branch.c | 3 +++
t/t3200-branch.sh | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index 6d0cea9..9e37078 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -221,6 +221,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
char *target = NULL;
int flags = 0;
+ if (!strcmp(argv[i], "-"))
+ argv[i] = "@{-1}";
+
strbuf_branchname(&bname, argv[i], allowed_interpret);
free(name);
name = mkpathdup(fmt, bname.buf);
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 6c0b7ea..78c25aa 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -776,6 +776,14 @@ test_expect_success 'deleting currently checked out branch fails' '
test_must_fail git branch -d my7
'
+test_expect_success 'test deleting last branch' '
+ git checkout -b my7.1 &&
+ git checkout - &&
+ test_path_is_file .git/refs/heads/my7.1 &&
+ git branch -d - &&
+ test_path_is_missing .git/refs/heads/my7.1
+'
+
test_expect_success 'test --track without .fetch entries' '
git branch --track my8 &&
test "$(git config branch.my8.remote)" &&
--
2.7.4
next prev parent reply other threads:[~2018-03-23 22:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 2:09 [PATCH] branch: implement shortcut to delete last branch Aaron Greenberg
2018-03-23 2:09 ` Aaron Greenberg
2018-03-23 8:56 ` Jeff King
2018-03-23 9:00 ` Jeff King
2018-03-23 22:40 ` [PATCH v2] " Aaron Greenberg
2018-03-23 22:40 ` Aaron Greenberg [this message]
2018-03-26 8:10 ` Jeff King
2018-03-26 12:41 ` git
2018-03-26 16:49 ` Junio C Hamano
2018-03-27 18:46 [PATCH] " Aaron Greenberg
2018-03-27 18:46 ` Aaron Greenberg
2018-03-27 19:11 ` Jonathan Nieder
2018-03-27 19:23 ` Ævar Arnfjörð Bjarmason
2018-03-27 19:26 ` Ævar Arnfjörð Bjarmason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1521844835-23956-2-git-send-email-p@aaronjgreenberg.com \
--to=p@aaronjgreenberg.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).