Merge branch 'rs/fgrep'

diff --git a/builtin-branch.c b/builtin-branch.c
index 494cbac0057e8b145d54eed8713adc7203d97efb..02fa38fd3b13b5c17aa23edbfd79f91a052adf76 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -165,7 +165,8 @@ 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.\n", remote, argv[i]);
+                       printf("Deleted %sbranch %s (%s).\n", remote, argv[i],
+                               find_unique_abbrev(sha1, DEFAULT_ABBREV));
                        strbuf_addf(&buf, "branch.%s", argv[i]);
                        if (git_config_rename_section(buf.buf, NULL) < 0)
                                warning("Update of config-file failed");