diff options
| author | Brandon Casey <drafnel@gmail.com> | 2009-03-22 00:09:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-22 00:30:51 (GMT) |
| commit | 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (patch) | |
| tree | e172b597996ac7e31f2376fea98ca08e6412e8e8 | |
| parent | a126ed0a01e265d7f3b2972a34e85636e12e6d34 (diff) | |
| download | git-76aac715465b7678ca5b834ccbdcb88a3ab8a9f4.zip git-76aac715465b7678ca5b834ccbdcb88a3ab8a9f4.tar.gz git-76aac715465b7678ca5b834ccbdcb88a3ab8a9f4.tar.bz2 | |
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Make it more pleasant to read about a branch deletion by adding "was".
Jeff King suggested this, and I ignored it. He was right.
Update t3200 test again to match the change in output.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-branch.c | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
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 && |