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

diff --cc builtin-branch.c
index 504a981ad56f73a547c11bf3e18185f67111d000,23b6949fec30e8276d0ef3d34e0aaee10eb49165..07166b8856b2a2637a55b20221a929d6dbea1e0c
--- 1/builtin-branch.c
--- 2/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);