projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add -O<orderfile> option to diff-* brothers.
[git.git]
/
diff-cache.c
diff --git
a/diff-cache.c
b/diff-cache.c
index
d573459
..
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)
@@
-187,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);
@@
-202,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;
@@
-224,7
+239,7
@@
int main(int argc, const char **argv)
usage(diff_cache_usage);
/* The rest is for paths restriction. */
usage(diff_cache_usage);
/* The rest is for paths restriction. */
- diff_setup(
reverse_diff
);
+ diff_setup(
diff_setup_opt
);
mark_merge_entries();
mark_merge_entries();
@@
-235,12
+250,12
@@
int main(int argc, const char **argv)
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr);
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr);
- if (detect_rename)
- diffcore_rename(detect_rename, diff_score_opt);
- if (pickaxe)
- diffcore_pickaxe(pickaxe);
- if (pathspec)
-
diffcore_pathspec(pathspec
);
+
+ 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;
}