Merge branch 'ta/docfix-index-format-tech'

diff --git a/builtin/branch.c b/builtin/branch.c
index 47e3eb92235a0bd0ef1b248eabca8ef0c0da51a0..58aa84f1e85212772d15175679e95263eae75123 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -253,7 +253,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
                        continue;
                }
 
-               if (delete_ref(name, sha1, REF_NODEREF)) {
+               if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1,
+                              REF_NODEREF)) {
                        error(remote_branch
                              ? _("Error deleting remote-tracking branch '%s'")
                              : _("Error deleting branch '%s'"),