projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-apply --stat: limit lines to 79 characters
[git.git]
/
diff-cache.c
diff --git
a/diff-cache.c
b/diff-cache.c
index
579a673
..
2aaf16a
100644
(file)
--- a/
diff-cache.c
+++ b/
diff-cache.c
@@
-5,9
+5,12
@@
static int cached_only = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int match_nonexisting = 0;
static int detect_rename = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int match_nonexisting = 0;
static int detect_rename = 0;
-static int
reverse_diff
= 0;
+static int
diff_setup_opt
= 0;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
static int diff_score_opt = 0;
static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
/* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
/* A file entry went away or appeared */
static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@
-154,20
+157,31
@@
static void mark_merge_entries(void)
}
static char *diff_cache_usage =
}
static char *diff_cache_usage =
-"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>
[<path>...]
";
int main(int argc, const char **argv)
{
int main(int argc, const char **argv)
{
- unsigned char tree_sha1[20];
+ const char *tree_name = NULL;
+ unsigned char sha1[20];
+ const char **pathspec = NULL;
void *tree;
unsigned long size;
int ret;
void *tree;
unsigned long size;
int ret;
+ int i;
read_cache();
read_cache();
- while (argc > 2) {
- const char *arg = argv[1];
- argv++;
- argc--;
+ for (i = 1; i < argc; i++) {
+ const char *arg = argv[i];
+
+ if (*arg != '-') {
+ if (tree_name) {
+ pathspec = argv + i;
+ break;
+ }
+ tree_name = arg;
+ continue;
+ }
+
if (!strcmp(arg, "-r")) {
/* We accept the -r flag just to look like git-diff-tree */
continue;
if (!strcmp(arg, "-r")) {
/* We accept the -r flag just to look like git-diff-tree */
continue;
@@
-176,6
+190,10
@@
int main(int argc, const char **argv)
diff_output_format = DIFF_FORMAT_PATCH;
continue;
}
diff_output_format = DIFF_FORMAT_PATCH;
continue;
}
+ if (!strncmp(arg, "-B", 2)) {
+ diff_break_opt = diff_scoreopt_parse(arg);
+ continue;
+ }
if (!strncmp(arg, "-M", 2)) {
detect_rename = DIFF_DETECT_RENAME;
diff_score_opt = diff_scoreopt_parse(arg);
if (!strncmp(arg, "-M", 2)) {
detect_rename = DIFF_DETECT_RENAME;
diff_score_opt = diff_scoreopt_parse(arg);
@@
-191,13
+209,21
@@
int main(int argc, const char **argv)
continue;
}
if (!strcmp(arg, "-R")) {
continue;
}
if (!strcmp(arg, "-R")) {
-
reverse_diff = 1
;
+
diff_setup_opt |= DIFF_SETUP_REVERSE
;
continue;
}
continue;
}
- if (!str
cmp(arg, "-S"
)) {
+ if (!str
ncmp(arg, "-S", 2
)) {
pickaxe = arg + 2;
continue;
}
pickaxe = arg + 2;
continue;
}
+ if (!strncmp(arg, "-O", 2)) {
+ orderfile = arg + 2;
+ continue;
+ }
+ if (!strcmp(arg, "--pickaxe-all")) {
+ pickaxe_opts = DIFF_PICKAXE_ALL;
+ continue;
+ }
if (!strcmp(arg, "-m")) {
match_nonexisting = 1;
continue;
if (!strcmp(arg, "-m")) {
match_nonexisting = 1;
continue;
@@
-209,30
+235,27
@@
int main(int argc, const char **argv)
usage(diff_cache_usage);
}
usage(diff_cache_usage);
}
- if (
argc < 2 || get_sha1(argv[1], tree_
sha1))
+ if (
!tree_name || get_sha1(tree_name,
sha1))
usage(diff_cache_usage);
usage(diff_cache_usage);
- argv++;
- argc--;
/* The rest is for paths restriction. */
/* The rest is for paths restriction. */
-
- diff_setup(reverse_diff);
+ diff_setup(diff_setup_opt);
mark_merge_entries();
mark_merge_entries();
- tree = read_object_with_reference(
tree_
sha1, "tree", &size, NULL);
+ tree = read_object_with_reference(sha1, "tree", &size, NULL);
if (!tree)
if (!tree)
- die("bad tree object %s",
argv[1]
);
+ die("bad tree object %s",
tree_name
);
if (read_tree(tree, size, 1))
if (read_tree(tree, size, 1))
- die("unable to read tree object %s",
argv[1]
);
+ die("unable to read tree object %s",
tree_name
);
ret = diff_cache(active_cache, active_nr);
ret = diff_cache(active_cache, active_nr);
- if (detect_rename)
- diffcore_rename(detect_rename, diff_score_opt);
- if (pickaxe)
- diffcore_pickaxe(pickaxe);
- if (2 <= argc)
-
diffcore_pathspec(argv + 1
);
+
+ diffcore_std(pathspec ? : NULL,
+ detect_rename, diff_score_opt,
+ pickaxe, pickaxe_opts,
+ diff_break_opt,
+
orderfile
);
diff_flush(diff_output_format, 1);
return ret;
}
diff_flush(diff_output_format, 1);
return ret;
}