From aefa4a5b1cb6cafab14b8179dc803881d1da45bf Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 23 Jun 2005 09:00:01 -0700 Subject: 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. --- apply.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index 31f134c9b3..c81b0a240a 100644 --- 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; -- cgit v1.2.3