undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-branch: display sha1 on branch deletion

Browse Source 
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>
This commit is contained in:
Brandon Casey 2008-12-12 17:20:07 -06:00 committed by Junio C Hamano
parent de0db42278
commit a126ed0a01
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-branch.c
View File

@ -165,7 +165,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
ret = 1; ret = 1;
} else { } else {
struct strbuf buf = STRBUF_INIT; 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]); strbuf_addf(&buf, "branch.%s", argv[i]);
if (git_config_rename_section(buf.buf, NULL) < 0) if (git_config_rename_section(buf.buf, NULL) < 0)
warning("Update of config-file failed"); warning("Update of config-file failed");

3
t/t3200-branch.sh
View File

@ -194,7 +194,8 @@ test_expect_success 'test deleting branch deletes branch config' \
test_expect_success 'test deleting branch without config' \ test_expect_success 'test deleting branch without config' \
'git branch my7 s && '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' \ test_expect_success 'test --track without .fetch entries' \
'git branch --track my8 && 'git branch --track my8 &&