t6023: merge-file fails to output anything for a degenerate merge

diff --git a/builtin-branch.c b/builtin-branch.c
index b1a2ad7a6b3b150cda8d031a87352a4daedc40ea..4b4abfd3639d2c6a1405e2e056ed5362b4b73abb 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -160,7 +160,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
                        continue;
                }
 
-               if (delete_ref(name, sha1)) {
+               if (delete_ref(name, sha1, 0)) {
                        error("Error deleting %sbranch '%s'", remote,
                               argv[i]);
                        ret = 1;