projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Find size of SHA1 object without inflating everything.
[git.git]
/
diff-files.c
diff --git
a/diff-files.c
b/diff-files.c
index
17c328a
..
3b05497
100644
(file)
--- a/
diff-files.c
+++ b/
diff-files.c
@@
-11,9
+11,12
@@
static const char *diff_files_usage =
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
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;
static int silent = 0;
static void show_unmerge(const char *path)
static int silent = 0;
static void show_unmerge(const char *path)
@@
-51,9
+54,15
@@
int main(int argc, const char **argv)
else if (!strcmp(argv[1], "-z"))
diff_output_format = DIFF_FORMAT_MACHINE;
else if (!strcmp(argv[1], "-R"))
else if (!strcmp(argv[1], "-z"))
diff_output_format = DIFF_FORMAT_MACHINE;
else if (!strcmp(argv[1], "-R"))
-
reverse_diff = 1
;
- else if (!str
cmp(argv[1], "-S"
))
+
diff_setup_opt |= DIFF_SETUP_REVERSE
;
+ else if (!str
ncmp(argv[1], "-S", 2
))
pickaxe = argv[1] + 2;
pickaxe = argv[1] + 2;
+ else if (!strncmp(argv[1], "-O", 2))
+ orderfile = argv[1] + 2;
+ else if (!strcmp(argv[1], "--pickaxe-all"))
+ pickaxe_opts = DIFF_PICKAXE_ALL;
+ else if (!strncmp(argv[1], "-B", 2))
+ diff_break_opt = diff_scoreopt_parse(argv[1]);
else if (!strncmp(argv[1], "-M", 2)) {
diff_score_opt = diff_scoreopt_parse(argv[1]);
detect_rename = DIFF_DETECT_RENAME;
else if (!strncmp(argv[1], "-M", 2)) {
diff_score_opt = diff_scoreopt_parse(argv[1]);
detect_rename = DIFF_DETECT_RENAME;
@@
-75,11
+84,11
@@
int main(int argc, const char **argv)
exit(1);
}
exit(1);
}
- diff_setup(
reverse_diff
);
+ diff_setup(
diff_setup_opt
);
for (i = 0; i < entries; i++) {
struct stat st;
for (i = 0; i < entries; i++) {
struct stat st;
- unsigned int oldmode
, mode
;
+ unsigned int oldmode;
struct cache_entry *ce = active_cache[i];
int changed;
struct cache_entry *ce = active_cache[i];
int changed;
@@
-107,19
+116,15
@@
int main(int argc, const char **argv)
continue;
oldmode = ntohl(ce->ce_mode);
continue;
oldmode = ntohl(ce->ce_mode);
- mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
- S_IFREG | ce_permissions(st.st_mode));
-
- show_modified(oldmode, mode, ce->sha1, null_sha1,
+ show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
+ ce->sha1, null_sha1,
ce->name);
}
ce->name);
}
- if (detect_rename)
- diffcore_rename(detect_rename, diff_score_opt);
- diffcore_prune();
- if (pickaxe)
- diffcore_pickaxe(pickaxe);
- if (1 < argc)
- diffcore_pathspec(argv + 1);
+ diffcore_std((1 < argc) ? argv + 1 : NULL,
+ detect_rename, diff_score_opt,
+ pickaxe, pickaxe_opts,
+ diff_break_opt,
+ orderfile);
diff_flush(diff_output_format, 1);
return 0;
}
diff_flush(diff_output_format, 1);
return 0;
}