From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 19:02:18 +0000 (-0700)
Subject: Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
X-Git-Tag: v1.6.2.2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8afd3178437eef29a08ba21aceb47a94177409d5

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

8afd3178437eef29a08ba21aceb47a94177409d5
diff --cc builtin-branch.c
index 504a981ad5,23b6949fec..07166b8856
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@@ -171,10 -165,9 +171,10 @@@ static int delete_branches(int argc, co
  			ret = 1;
  		} else {
  			struct strbuf buf = STRBUF_INIT;
- 			printf("Deleted %sbranch %s (%s).\n", remote,
 -			printf("Deleted %sbranch %s (was %s).\n", remote, argv[i],
 -				find_unique_abbrev(sha1, DEFAULT_ABBREV));
 -			strbuf_addf(&buf, "branch.%s", argv[i]);
++			printf("Deleted %sbranch %s (was %s).\n", remote,
 +			       bname.buf,
 +			       find_unique_abbrev(sha1, DEFAULT_ABBREV));
 +			strbuf_addf(&buf, "branch.%s", bname.buf);
  			if (git_config_rename_section(buf.buf, NULL) < 0)
  				warning("Update of config-file failed");
  			strbuf_release(&buf);