Merge branch 'maint'

* maint: format-patch: Squelch 'fatal: Not a range." error
git-mirror · Mar 30, 2010 · 87b3c01 · 87b3c01
2 parents 6a69551 + 657ab61
commit 87b3c01
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/builtin/log.c b/builtin/log.c
@@ -1157,8 +1157,15 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			return 0;
 	}
 
-	if (ignore_if_in_upstream)
+	if (ignore_if_in_upstream) {
+		/* Don't say anything if head and upstream are the same. */
+		if (rev.pending.nr == 2) {
+			struct object_array_entry *o = rev.pending.objects;
+			if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
+				return 0;
+		}
 		get_patch_ids(&rev, &ids, prefix);
+	}
 
 	if (!use_stdout)
 		realstdout = xfdopen(xdup(1), "w");

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
@@ -609,4 +609,8 @@ test_expect_success 'format-patch -- <path>' '
 	! grep "Use .--" error
 '
 
+test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
+	git format-patch --ignore-if-in-upstream HEAD
+'
+
 test_done