summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-05 01:25:18 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-06 22:57:42 -0800
commite9c8409900fc84cd7721117c98dfe01acd535aa2 (patch)
tree9904b7d43e86e423dbfc8454a5e7306c24d7cb73 /diff.h
parent13e86efbeae5994a85cc482b3964db7298c5c6ea (diff)
downloadgit-e9c8409900fc84cd7721117c98dfe01acd535aa2.tar.gz
diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
This updates the way diffcore represents an unmerged pair somewhat. It used to be that entries with mode=0 on both sides were used to represent an unmerged pair, but now it has an explicit flag. This is to allow diff-index --cached to report the entry from the tree when the path is unmerged in the index. This is used in updating "git reset <tree> -- <path>" to restore absense of the path in the index from the tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index eff445596d..7a347cf77d 100644
--- a/diff.h
+++ b/diff.h
@@ -144,7 +144,9 @@ extern void diff_change(struct diff_options *,
const char *base, const char *path);
extern void diff_unmerge(struct diff_options *,
- const char *path);
+ const char *path,
+ unsigned mode,
+ const unsigned char *sha1);
extern int diff_scoreopt_parse(const char *opt);