[PATCH] Fix apply.c to match rename extended header to the document.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jun 5, 2005, 22:27 UTC
- Message-ID
- <7v8y1o1ltn.fsf_-_@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.58.0506051509490.1876@ppc970.osdl.org>
This matches the git extended header git-apply expects to what is documented.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- # - linus: git-apply: fix rename header parsing # + (working tree)
diff --git a/apply.c b/apply.c --- a/apply.c +++ b/apply.c @@ -435,8 +435,8 @@ static int parse_git_header(char *line, { "new file mode ", gitdiff_newfile }, { "copy from ", gitdiff_copysrc }, { "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 },