# [PATCH] git-branch: display "was sha1" on branch deletion rather than just "sha1" 3 messages from 2009-03-22 to 2009-03-22. Participants: Brandon Casey, Jeff King. Thread: https://gitlist.dev/t/18461 ## Brandon Casey, 2009-03-22 00:09 Subject: [PATCH] git-branch: display "was sha1" on branch deletion rather than just "sha1" Message-ID: URL: https://gitlist.dev/e/ee63ef30903211709s24f8294dq9ea52bcae72b755a%40mail.gmail.com ``` 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 --- builtin-branch.c | 2 +- t/t3200-branch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin-branch.c b/builtin-branch.c index 14d4b91..07a440e 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 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 && -- 1.6.2.12.g83676 ``` ## Jeff King, 2009-03-22 06:13 Subject: Re: [PATCH] git-branch: display "was sha1" on branch deletion rather than just "sha1" Message-ID: <20090322061320.GB14765@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090322061320.GB14765%40coredump.intra.peff.net In-Reply-To: ``` On Sat, Mar 21, 2009 at 07:09:17PM -0500, Brandon Casey wrote: > Make it more pleasant to read about a branch deletion by adding "was". > Jeff King suggested this, and I ignored it. He was right. Heh. While I am tempted to dance in a circle shouting "I told you so", I actually find that after getting used to it, I do not mind the current output. ;) Out of curiosity, what prompted your change of heart? Did you hear from somebody who found it confusing, or did you just change your mind? -Peff ``` ## Brandon Casey, 2009-03-22 15:11 Subject: Re: [PATCH] git-branch: display "was sha1" on branch deletion rather than just "sha1" Message-ID: URL: https://gitlist.dev/e/ee63ef30903220811m69c45e9cna0af52a3b5a851fe%40mail.gmail.com In-Reply-To: <20090322061320.GB14765@coredump.intra.peff.net> ``` On Sun, Mar 22, 2009 at 1:13 AM, Jeff King wrote: > On Sat, Mar 21, 2009 at 07:09:17PM -0500, Brandon Casey wrote: > >> Make it more pleasant to read about a branch deletion by adding "was". >> Jeff King suggested this, and I ignored it.  He was right. > > Heh. While I am tempted to dance in a circle shouting "I told you so", I > actually find that after getting used to it, I do not mind the current > output. ;) > > Out of curiosity, what prompted your change of heart? Did you hear from > somebody who found it confusing, or did you just change your mind? I just changed my mind. My original opinion was based on the output from 'git stash drop'. It has the full sha1 in the message and looks like: $git stash drop Dropped refs/stash@{0} (58fa28fddd951deb782e3300b2d059f95544f6f1) I like it. I like the full sha1. For some reason, the partial sha1 in the branch delete message irritated me. $ git branch -d mybranch Deleted branch mybranch (455f59b). I don't think it was because it was a partial sha1. Maybe it was because the message seemed to imply that what was referenced by the sha1 was being deleted. The branch is just a pointer, so deleting it does not mean that what it pointed at was lost in any way. I think adding "was" makes it seem more like a pointer to me. Or maybe it has something to do with my mother, any psychology majors in the audience? :) -brandon ```