mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
git-apply: take "--apply" flag to force an apply even if we also ask for a diffstat
Also, remove debugging statement about applying a fragment at an offset.
This commit is contained in:
parent
5fca669f19
commit
aefa4a5b1c
5
apply.c
5
apply.c
|
@ -860,7 +860,6 @@ static int find_offset(const char *buf, unsigned long size, const char *fragment
|
|||
n = (i >> 1)+1;
|
||||
if (i & 1)
|
||||
n = -n;
|
||||
fprintf(stderr, "Fragment applied at offset %d\n", n);
|
||||
return try;
|
||||
}
|
||||
|
||||
|
@ -1434,6 +1433,10 @@ int main(int argc, char **argv)
|
|||
check_index = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--apply")) {
|
||||
apply = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--show-files")) {
|
||||
show_files = 1;
|
||||
continue;
|
||||
|
|
Loading…
Reference in a new issue