aboutsummaryrefslogtreecommitdiffstats
path: root/apply.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 15:31:52 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 15:31:52 -0700
commitdc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 (patch)
tree5e1c39a01feb2364f97f2c0c72e4a5870af9a69d /apply.c
parentf7b797073c2286fff8c4d46842ed00d868f3b2fa (diff)
downloadgit-dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0.tar.gz
diff 'rename' format change.
Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while.
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apply.c b/apply.c
index ec63a0c1e0..1f48ef906f 100644
--- a/apply.c
+++ b/apply.c
@@ -437,6 +437,8 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch
{ "copy to ", gitdiff_copydst },
{ "rename old ", gitdiff_renamesrc },
{ "rename new ", gitdiff_renamedst },
+ { "rename from ", gitdiff_renamesrc },
+ { "rename to ", gitdiff_renamedst },
{ "similarity index ", gitdiff_similarity },
{ "dissimilarity index ", gitdiff_dissimilarity },
{ "", gitdiff_unrecognized },