diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-02 12:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-02 12:02:18 -0700 |
| commit | 8afd3178437eef29a08ba21aceb47a94177409d5 (patch) | |
| tree | 533fedcb0e579f28157dd12340fe9f962b506921 | |
| parent | b5a18787bd5c757b49a7ea4fdd73e62a1fee35de (diff) | |
| parent | 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff) | |
| download | git-8afd3178437eef29a08ba21aceb47a94177409d5.tar.gz git-8afd3178437eef29a08ba21aceb47a94177409d5.tar.xz | |
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Conflicts:
builtin-branch.c
| -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 504a981ad..07166b885 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -171,7 +171,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, + printf("Deleted %sbranch %s (was %s).\n", remote, bname.buf, find_unique_abbrev(sha1, DEFAULT_ABBREV)); strbuf_addf(&buf, "branch.%s", bname.buf); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 61a2010f5..1b1e9ece5 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 && |