undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1

Browse Source 
* bc/maint-1.6.1-branch-deleted-was:
  git-branch: display "was sha1" on branch deletion rather than just "sha1"
This commit is contained in:
Junio C Hamano 2009-04-08 23:01:15 -07:00
commit 1c9f54417e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-branch.c
View File

@ -165,7 +165,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, argv[i], printf("Deleted %sbranch %s (was %s).\n", remote, argv[i],
find_unique_abbrev(sha1, DEFAULT_ABBREV)); find_unique_abbrev(sha1, DEFAULT_ABBREV));
strbuf_addf(&buf, "branch.%s", argv[i]); strbuf_addf(&buf, "branch.%s", argv[i]);
if (git_config_rename_section(buf.buf, NULL) < 0) if (git_config_rename_section(buf.buf, NULL) < 0)

2
t/t3200-branch.sh
View File

@ -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 &&