projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove delta-against-self bit
[git.git]
/
diff-index.c
diff --git
a/diff-index.c
b/diff-index.c
index
c9a9f4c
..
f8a102e
100644
(file)
--- a/
diff-index.c
+++ b/
diff-index.c
@@
-1,4
+1,5
@@
#include "cache.h"
#include "cache.h"
+#include "tree.h"
#include "diff.h"
static int cached_only = 0;
#include "diff.h"
static int cached_only = 0;
@@
-116,7
+117,7
@@
static int diff_cache(struct cache_entry **ac, int entries, const char **pathspe
/* We come here with ce pointing at stage 1
* (original tree) and ac[1] pointing at stage
* 3 (unmerged). show-modified with
/* We come here with ce pointing at stage 1
* (original tree) and ac[1] pointing at stage
* 3 (unmerged). show-modified with
- * report-mising set to false does not say the
+ * report-mis
s
ing set to false does not say the
* file is deleted but reports true if work
* tree does not have it, in which case we
* fall through to report the unmerged state.
* file is deleted but reports true if work
* tree does not have it, in which case we
* fall through to report the unmerged state.
@@
-174,13
+175,12
@@
int main(int argc, const char **argv)
unsigned char sha1[20];
const char *prefix = setup_git_directory();
const char **pathspec = NULL;
unsigned char sha1[20];
const char *prefix = setup_git_directory();
const char **pathspec = NULL;
- void *tree;
- unsigned long size;
+ struct tree *tree;
int ret;
int allow_options = 1;
int i;
int ret;
int allow_options = 1;
int i;
- git_config(git_d
efault
_config);
+ git_config(git_d
iff
_config);
diff_setup(&diff_options);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
diff_setup(&diff_options);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@
-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)
@@
-233,10
+241,10
@@
int main(int argc, const char **argv)
mark_merge_entries();
mark_merge_entries();
- tree =
read_object_with_reference(sha1, "tree", &size, NULL
);
+ tree =
parse_tree_indirect(sha1
);
if (!tree)
die("bad tree object %s", tree_name);
if (!tree)
die("bad tree object %s", tree_name);
- if (read_tree(tree,
size,
1, pathspec))
+ if (read_tree(tree, 1, pathspec))
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr, pathspec);
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr, pathspec);