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

From

Kevin Ballard <kevin@sb.org>

Date

Mar 30, 2010, 02:46 UTC

Message-ID

<1269917198-58320-1-git-send-email-kevin@sb.org>

In-Reply-To

<46BEF37C-3E3F-4490-9CE6-C0109438C181@sb.org>

Signed-off-by: Kevin Ballard <kevin@sb.org>
---
This seems like a safer change than just deleting the die("Not a range.").
The conditional here is copied from cmd_cherry().
 builtin/log.c           |    9 ++++++++-
 t/t4014-format-patch.sh |    4 ++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index 0cb4d5a..362dd42 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1179,8 +1179,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
index c7b6256..d21c37f 100755
--- 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

-- 
1.7.0.3.436.g3ff98