diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-12-13 02:20:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-13 07:42:59 +0300 |
| commit | a126ed0a01e265d7f3b2972a34e85636e12e6d34 (patch) | |
| tree | 3594874c3779aae3f1b1f0a9a8f74d5aa6bc7327 | |
| parent | de0db422782ddaf7754ac5b03fdc6dc5de1a9ae4 (diff) | |
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>
| -rw-r--r-- | builtin-branch.c | 3 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 494cbac005..02fa38fd3b 100644 --- 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; - 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"); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 25e9971fd8..61a2010f5b 100755 --- 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 "$(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 && |