git-branch: display "was sha1" on branch deletion rather than just "sha1"

Make it more pleasant to read about a branch deletion by adding "was".
Jeff King suggested this, and I ignored it.  He was right.

Update t3200 test again to match the change in output.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-branch.c b/builtin-branch.c
index 02fa38fd3b13b5c17aa23edbfd79f91a052adf76..23b6949fec30e8276d0ef3d34e0aaee10eb49165 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -165,7 +165,7 @@ 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 (%s).\n", remote, argv[i],
+                       printf("Deleted %sbranch %s (was %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)
                                find_unique_abbrev(sha1, DEFAULT_ABBREV));
                        strbuf_addf(&buf, "branch.%s", argv[i]);
                        if (git_config_rename_section(buf.buf, NULL) < 0)

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 61a2010f5b0e24a50c6cddda9a17bad67f3214b8..1b1e9ece572b68d5a415458c799690c06ddd3695 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -195,7 +195,7 @@ test_expect_success 'test deleting branch deletes branch config' \
 test_expect_success 'test deleting branch without config' \
     'git branch my7 s &&
      sha1=$(git rev-parse my7 | cut -c 1-7) &&
 test_expect_success 'test deleting branch without config' \
     'git branch my7 s &&
      sha1=$(git rev-parse my7 | cut -c 1-7) &&

-     test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."'
+     test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $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 &&