diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-04 03:54:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-04 03:54:20 -0800 |
| commit | a622f6b35eb72b0ce738c03d6b49f760501bce78 (patch) | |
| tree | 9508a491cacb3a06092b694f83e58a2c9c163287 /builtin-apply.c | |
| parent | 6768d6b8477db41a1cfdbd1d81ac8c5131c58e1d (diff) | |
| parent | 6f9f3b263b1c86889d6fae0d50c75be0f3227003 (diff) | |
| download | git-a622f6b35eb72b0ce738c03d6b49f760501bce78.tar.gz | |
Merge branch 'maint'
* maint:
apply: handle "traditional" creation/deletion diff correctly.
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 11397f5504..db7cdce1d3 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1043,10 +1043,14 @@ static int parse_single_patch(char *line, unsigned long size, struct patch *patc * then not having oldlines means the patch is creation, * and not having newlines means the patch is deletion. */ - if (patch->is_new < 0 && !oldlines) + if (patch->is_new < 0 && !oldlines) { patch->is_new = 1; - if (patch->is_delete < 0 && !newlines) + patch->old_name = NULL; + } + if (patch->is_delete < 0 && !newlines) { patch->is_delete = 1; + patch->new_name = NULL; + } } if (0 < patch->is_new && oldlines) |