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.

diff --git a/apply.c b/apply.c
index 31f134c9b325263fc10e09bb92570010241ca449..c81b0a240a38b57a9bbd2586889304bef8f5cbbf 100644 (file)
--- a/apply.c
+++ b/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;