summaryrefslogtreecommitdiff
path: root/builtin-branch.c
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-12-12 17:20:07 -0600
committerJunio C Hamano <gitster@pobox.com>2008-12-12 20:42:59 -0800
commita126ed0a01e265d7f3b2972a34e85636e12e6d34 (patch)
tree3594874c3779aae3f1b1f0a9a8f74d5aa6bc7327 /builtin-branch.c
parentde0db422782ddaf7754ac5b03fdc6dc5de1a9ae4 (diff)
downloadgit-a126ed0a01e265d7f3b2972a34e85636e12e6d34.tar.gz
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>
Diffstat (limited to 'builtin-branch.c')
-rw-r--r--builtin-branch.c3
1 files changed, 2 insertions, 1 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");