From 70aadac081d8c05ae31616c8f63b73ee3e83c45a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 30 May 2005 16:40:16 -0700 Subject: [PATCH] Show dissimilarity index for D and N case. The way broken deletes and creates are shown in the -p (diff-patch) output format has become consistent with how rename/copy edits are shown. They will show "dissimilarity index" value, immediately following the "deleted file mode" and "new file mode" lines. The git-apply is taught to grok such an extended header. Signed-off-by: Junio C Hamano --- apply.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'apply.c') diff --git a/apply.c b/apply.c index 3160207b92..74908cd4d4 100644 --- a/apply.c +++ b/apply.c @@ -336,6 +336,11 @@ static int gitdiff_similarity(const char *line, struct patch *patch) return 0; } +static int gitdiff_dissimilarity(const char *line, struct patch *patch) +{ + return 0; +} + /* * This is normal for a diff that doesn't change anything: we'll fall through * into the next diff. Tell the parser to break out. @@ -437,6 +442,7 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch { "rename from ", gitdiff_renamesrc }, { "rename to ", gitdiff_renamedst }, { "similarity index ", gitdiff_similarity }, + { "dissimilarity index ", gitdiff_dissimilarity }, { "", gitdiff_unrecognized }, }; int i; -- cgit v1.2.3