format-patch: Squelch 'fatal: Not a range." error

lilyball · gitster · commit 657ab61efa91 · 2010-03-29T21:22:37.000-07:00
Don't output an error on `git format-patch --ignore-if-in-upstream HEAD`.
This matches the behavior of `git format-patch HEAD`.

Signed-off-by: Kevin Ballard &lt;kevin@sb.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-log.c b/builtin-log.c
@@ -1106,8 +1106,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
@@ -557,4 +557,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

Original file line number	Diff line number	Diff line change
`@@ -557,4 +557,8 @@ test_expect_success 'format-patch -- <path>' '`
`557`	`557`	`! grep "Use .--" error`
`558`	`558`	`'`
`559`	`559`
	`560`	`+test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '`
	`561`	`+ git format-patch --ignore-if-in-upstream HEAD`
	`562`	`+'`
	`563`	`+`
`560`	`564`	`test_done`