projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test to verify that when git-clone fails it cleans up the new directory.
[git.git]
/
diff-index.c
diff --git
a/diff-index.c
b/diff-index.c
index
bbd873b
..
f8a102e
100644
(file)
--- a/
diff-index.c
+++ b/
diff-index.c
@@
-201,6
+201,14
@@
int main(int argc, const char **argv)
/* We accept the -r flag just to look like git-diff-tree */
continue;
}
/* We accept the -r flag just to look like git-diff-tree */
continue;
}
+ if (!strcmp(arg, "--cc"))
+ /*
+ * I _think_ "diff-index --cached HEAD" with an
+ * unmerged index could show something else
+ * later, but pretend --cc is the same as -p for
+ * now. "git diff" uses --cc by default.
+ */
+ argv[i] = arg = "-p";
diff_opt_cnt = diff_opt_parse(&diff_options, argv + i,
argc - i);
if (diff_opt_cnt < 0)
diff_opt_cnt = diff_opt_parse(&diff_options, argv + i,
argc - i);
if (diff_opt_cnt < 0)