diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-12 09:37:38 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-12 09:37:38 +0300 |
commit | f7a2eb735982e921ae4379f1dcf5f7a023610393 (patch) | |
tree | 26fe2c59a8fed68a531e7b855a495f52198162a2 /apply.c | |
parent | 23ea3e201cea0deea909569e08e950a9ec2345f7 (diff) | |
parent | 7765e7ebda7e273bca34e87110be899447068b58 (diff) |
This is GIT 1.0-rc1 in disguise. It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
-rw-r--r-- | apply.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -23,10 +23,11 @@ static int numstat = 0; static int summary = 0; static int check = 0; static int apply = 1; +static int no_add = 0; static int show_index_info = 0; static int line_termination = '\n'; static const char apply_usage[] = -"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] <patch>..."; +"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] <patch>..."; /* * For "diff-stat" like behaviour, we keep track of the biggest change @@ -1112,8 +1113,10 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag) break; /* Fall-through for ' ' */ case '+': - memcpy(new + newsize, patch + 1, plen); - newsize += plen; + if (*patch != '+' || !no_add) { + memcpy(new + newsize, patch + 1, plen); + newsize += plen; + } break; case '@': case '\\': /* Ignore it, we already handled it */ @@ -1710,6 +1713,10 @@ int main(int argc, char **argv) excludes = x; continue; } + if (!strcmp(arg, "--no-add")) { + no_add = 1; + continue; + } if (!strcmp(arg, "--stat")) { apply = 0; diffstat = 1; |