development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  format-patch: Squelch 'fatal: Not a range." error
This commit is contained in:
Junio C Hamano 2010-03-29 21:29:24 -07:00
commit 87b3c0117a
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builtin/log.c
View file

@ -1157,8 +1157,15 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
return 0; 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); get_patch_ids(&rev, &ids, prefix);
}
if (!use_stdout) if (!use_stdout)
realstdout = xfdopen(xdup(1), "w"); realstdout = xfdopen(xdup(1), "w");

4
t/t4014-format-patch.sh
View file

@ -609,4 +609,8 @@ test_expect_success 'format-patch -- <path>' '
! grep "Use .--" error ! grep "Use .--" error
' '
test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
git format-patch --ignore-if-in-upstream HEAD
'
test_done test_done