Skip to content

Commit

Permalink
git-apply: take "--apply" flag to force an apply even if we also ask …
Browse files Browse the repository at this point in the history
…for a diffstat

Also, remove debugging statement about applying a fragment at an offset.
  • Loading branch information
Linus Torvalds committed Jun 23, 2005
1 parent 5fca669 commit aefa4a5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion apply.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit aefa4a5

Please sign in to comment.