From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 23 Jun 2005 16:00:01 +0000 (-0700)
Subject: git-apply: take "--apply" flag to force an apply even if we also ask for a diffstat
X-Git-Tag: v0.99~197
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aefa4a5b1cb6cafab14b8179dc803881d1da45bf;p=git.git

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 31f134c9b..c81b0a240 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;