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>
Brandon Casey committed
Dec 12, 2008 at 17:20 UTC
a126ed0a01e265d7f3b2972a34e85636e12e6d34
2 files changed
+4
-2
builtin-branch.c
+2
-1
@@ -165,7 +165,8 @@ 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.\n", remote, argv[i]);
168
+ printf("Deleted %sbranch %s (%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)
172
warning("Update of config-file failed");
t/t3200-branch.sh
+2
-1
@@ -194,7 +194,8 @@ test_expect_success 'test deleting branch deletes branch config' \
194
195
test_expect_success 'test deleting branch without config' \
196
'git branch my7 s &&
197
- test "$(git branch -d my7 2>&1)" = "Deleted branch my7."'
197
+ sha1=$(git rev-parse my7 | cut -c 1-7) &&
198
+ test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."'
199
200
test_expect_success 'test --track without .fetch entries' \
201
'git branch --track my8 &&