summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-30 23:40:16 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 01:10:46 (GMT)
commit70aadac081d8c05ae31616c8f63b73ee3e83c45a (patch)
tree6693955e7284bd54d46bde932cf17bee249b556b /apply.c
parentaf5323e0274fad058f13949b89a9191a7bef7e38 (diff)
downloadgit-70aadac081d8c05ae31616c8f63b73ee3e83c45a.zip
git-70aadac081d8c05ae31616c8f63b73ee3e83c45a.tar.gz
git-70aadac081d8c05ae31616c8f63b73ee3e83c45a.tar.bz2
[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 <junkio@cox.net>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apply.c b/apply.c
index 3160207..74908cd 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;