From a126ed0a01e265d7f3b2972a34e85636e12e6d34 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Fri, 12 Dec 2008 17:20:07 -0600 Subject: [PATCH] git-branch: display sha1 on branch deletion Make it easier to recover from a mistaken branch deletion by displaying the sha1 of the branch's tip commit. Update t3200 test to match the change in output. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- builtin-branch.c | 3 ++- t/t3200-branch.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin-branch.c b/builtin-branch.c index 494cbac00..02fa38fd3 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -165,7 +165,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) ret = 1; } else { struct strbuf buf = STRBUF_INIT; - printf("Deleted %sbranch %s.\n", remote, argv[i]); + printf("Deleted %sbranch %s (%s).\n", remote, argv[i], + find_unique_abbrev(sha1, DEFAULT_ABBREV)); strbuf_addf(&buf, "branch.%s", argv[i]); if (git_config_rename_section(buf.buf, NULL) < 0) warning("Update of config-file failed"); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 25e9971fd..61a2010f5 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -194,7 +194,8 @@ test_expect_success 'test deleting branch deletes branch config' \ test_expect_success 'test deleting branch without config' \ 'git branch my7 s && - test "$(git branch -d my7 2>&1)" = "Deleted branch my7."' + sha1=$(git rev-parse my7 | cut -c 1-7) && + test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."' test_expect_success 'test --track without .fetch entries' \ 'git branch --track my8 && -- 2.30.2