Merge branch 'maint'

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

1 files changed, 8 insertions, 1 deletions

diff --git a/builtin/log.c b/builtin/log.c
index a8dd8c989c..542ecc708b 100644
--- 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");