git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brandon Casey <drafnel@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: [PATCH] git-branch: display "was sha1" on branch deletion rather than  just "sha1"
Date: Sat, 21 Mar 2009 19:09:17 -0500	[thread overview]
Message-ID: <ee63ef30903211709s24f8294dq9ea52bcae72b755a@mail.gmail.com> (raw)

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

             reply	other threads:[~2009-03-22  0:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-22  0:09 Brandon Casey [this message]
2009-03-22  6:13 ` [PATCH] git-branch: display "was sha1" on branch deletion rather than just "sha1" Jeff King
2009-03-22 15:11   ` Brandon Casey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ee63ef30903211709s24f8294dq9ea52bcae72b755a@mail.gmail.com \
    --to=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).