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>
Brandon Casey committed
Mar 21, 2009 at 19:09 UTC
76aac715465b7678ca5b834ccbdcb88a3ab8a9f4
2 files changed
+2
-2
builtin-branch.c
+1
-1
@@ -165,7 +165,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
165
ret = 1;
166
} else {
167
struct strbuf buf = STRBUF_INIT;
168
- printf("Deleted %sbranch %s (%s).\n", remote, argv[i],
168
+ printf("Deleted %sbranch %s (was %s).\n", remote, argv[i],
169
find_unique_abbrev(sha1, DEFAULT_ABBREV));
170
strbuf_addf(&buf, "branch.%s", argv[i]);
171
if (git_config_rename_section(buf.buf, NULL) < 0)
t/t3200-branch.sh
+1
-1
@@ -195,7 +195,7 @@ test_expect_success 'test deleting branch deletes branch config' \
195
test_expect_success 'test deleting branch without config' \
196
'git branch my7 s &&
197
sha1=$(git rev-parse my7 | cut -c 1-7) &&
198
- test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."'
198
+ test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'
199
200
test_expect_success 'test --track without .fetch entries' \
201
'git branch --track my8 &&