Merge branch 'maint'

gitster · gitster · commit 87b3c0117a34 · 2010-03-29T21:29:24.000-07:00
* maint:
  format-patch: Squelch 'fatal: Not a range." error
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

Original file line number	Diff line number	Diff line change
`@@ -609,4 +609,8 @@ test_expect_success 'format-patch -- <path>' '`
`609`	`609`	`! grep "Use .--" error`
`610`	`610`	`'`
`611`	`611`
	`612`	`+test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '`
	`613`	`+ git format-patch --ignore-if-in-upstream HEAD`
	`614`	`+'`
	`615`	`+`
`612`	`616`	`test_done`