mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
* bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" Conflicts: builtin-branch.c
This commit is contained in:
commit
23fd723c9d
|
@ -171,7 +171,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
|
||||||
ret = 1;
|
ret = 1;
|
||||||
} else {
|
} else {
|
||||||
struct strbuf buf = STRBUF_INIT;
|
struct strbuf buf = STRBUF_INIT;
|
||||||
printf("Deleted %sbranch %s (%s).\n", remote,
|
printf("Deleted %sbranch %s (was %s).\n", remote,
|
||||||
bname.buf,
|
bname.buf,
|
||||||
find_unique_abbrev(sha1, DEFAULT_ABBREV));
|
find_unique_abbrev(sha1, DEFAULT_ABBREV));
|
||||||
strbuf_addf(&buf, "branch.%s", bname.buf);
|
strbuf_addf(&buf, "branch.%s", bname.buf);
|
||||||
|
|
|
@ -195,7 +195,7 @@ test_expect_success 'test deleting branch deletes branch config' \
|
||||||
test_expect_success 'test deleting branch without config' \
|
test_expect_success 'test deleting branch without config' \
|
||||||
'git branch my7 s &&
|
'git branch my7 s &&
|
||||||
sha1=$(git rev-parse my7 | cut -c 1-7) &&
|
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' \
|
test_expect_success 'test --track without .fetch entries' \
|
||||||
'git branch --track my8 &&
|
'git branch --track my8 &&
|
||||||
|
|
Loading…
Reference in a new issue