summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-09 06:01:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-09 06:01:15 (GMT)
commit1c9f54417e22103a04c51293369a48b6d3386ac4 (patch)
tree70b9563b202f70c463dca9b6c5cb80e9352eae7d
parent1f398ee772552ba9763d979cf66566e48acfa302 (diff)
parent76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff)
downloadgit-1c9f54417e22103a04c51293369a48b6d3386ac4.zip
git-1c9f54417e22103a04c51293369a48b6d3386ac4.tar.gz
git-1c9f54417e22103a04c51293369a48b6d3386ac4.tar.bz2
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1
* bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1"
-rw-r--r--builtin-branch.c2
-rwxr-xr-xt/t3200-branch.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index 02fa38f..23b6949 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -165,7 +165,7 @@ 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 (%s).\n", remote, argv[i],
+ printf("Deleted %sbranch %s (was %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)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 61a2010..1b1e9ec 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -195,7 +195,7 @@ test_expect_success 'test deleting branch deletes branch config' \
test_expect_success 'test deleting branch without config' \
'git branch my7 s &&
sha1=$(git rev-parse my7 | cut -c 1-7) &&
- test "$(git branch -d my7 2>&1)" = "Deleted branch my7 ($sha1)."'
+ test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'
test_expect_success 'test --track without .fetch entries' \
'git branch --track my8 &&