mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-apply: take "--apply" flag to force an apply even if we also ask for a diffstat

Browse Source 
Also, remove debugging statement about applying a fragment at an offset.
This commit is contained in:
Linus Torvalds
2005-06-23 09:00:01 -07:00
parent 5fca669f19
commit aefa4a5b1c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apply.c
View File

@ -860,7 +860,6 @@ static int find_offset(const char *buf, unsigned long size, const char *fragment
n = (i >> 1)+1; n = (i >> 1)+1;
if (i & 1) if (i & 1)
n = -n; n = -n;
fprintf(stderr, "Fragment applied at offset %d\n", n);
return try; return try;
} }
@ -1434,6 +1433,10 @@ int main(int argc, char **argv)
check_index = 1; check_index = 1;
continue; continue;
} }
if (!strcmp(arg, "--apply")) {
apply = 1;
continue;
}
if (!strcmp(arg, "--show-files")) { if (!strcmp(arg, "--show-files")) {
show_files = 1; show_files = 1;
continue; continue;