summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 16:00:01 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 16:00:01 (GMT)
commitaefa4a5b1cb6cafab14b8179dc803881d1da45bf (patch)
tree15dcd367cda06b00b24926d4597880dac5f68129 /apply.c
parent5fca669f1933ca3ef5f93ee2bf8871183bc2a7c2 (diff)
downloadgit-aefa4a5b1cb6cafab14b8179dc803881d1da45bf.zip
git-aefa4a5b1cb6cafab14b8179dc803881d1da45bf.tar.gz
git-aefa4a5b1cb6cafab14b8179dc803881d1da45bf.tar.bz2
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.
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 31f134c..c81b0a2 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;