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 <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-branch.c b/builtin-branch.c
index 494cbac0057e8b145d54eed8713adc7203d97efb..02fa38fd3b13b5c17aa23edbfd79f91a052adf76 100644 (file)
--- 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;
                        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");
                        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 25e9971fd86af10c1031f4e8061c31a0c80725a7..61a2010f5b0e24a50c6cddda9a17bad67f3214b8 100755 (executable)
--- 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_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 &&
 
 test_expect_success 'test --track without .fetch entries' \
     'git branch --track my8 &&