projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-diff-tree: don't use diffcore_pathspec()
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
31f8019
..
8297b7f
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-2,11
+2,11
@@
#include "cache.h"
#include "diff.h"
#include "cache.h"
#include "diff.h"
-static int silent = 0;
static int show_root_diff = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int recursive = 0;
static int show_root_diff = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int recursive = 0;
+static int show_tree_entry_in_recursive = 0;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
static int read_stdin = 0;
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;
@@
-67,9
+67,6
@@
static void show_file(const char *prefix, void *tree, unsigned long size, const
const char *path;
const unsigned char *sha1 = extract(tree, size, &path, &mode);
const char *path;
const unsigned char *sha1 = extract(tree, size, &path, &mode);
- if (silent)
- return;
-
if (recursive && S_ISDIR(mode)) {
char type[20];
unsigned long size;
if (recursive && S_ISDIR(mode)) {
char type[20];
unsigned long size;
@@
-127,14
+124,13
@@
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
if (recursive && S_ISDIR(mode1)) {
int retval;
char *newbase = malloc_base(base, path1, pathlen1);
if (recursive && S_ISDIR(mode1)) {
int retval;
char *newbase = malloc_base(base, path1, pathlen1);
+ if (show_tree_entry_in_recursive)
+ diff_change(mode1, mode2, sha1, sha2, base, path1);
retval = diff_tree_sha1(sha1, sha2, newbase);
free(newbase);
return retval;
}
retval = diff_tree_sha1(sha1, sha2, newbase);
free(newbase);
return retval;
}
- if (silent)
- return 0;
-
diff_change(mode1, mode2, sha1, sha2, base, path1);
return 0;
}
diff_change(mode1, mode2, sha1, sha2, base, path1);
return 0;
}
@@
-266,16
+262,12
@@
static int call_diff_flush(void)
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
{
if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt);
- diffcore_prune();
if (pickaxe)
diffcore_pickaxe(pickaxe);
if (pickaxe)
diffcore_pickaxe(pickaxe);
-
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
return 0;
}
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
return 0;
}
- if (nr_paths)
- diffcore_pathspec(paths);
if (header) {
if (diff_output_format == DIFF_FORMAT_MACHINE) {
const char *ep, *cp;
if (header) {
if (diff_output_format == DIFF_FORMAT_MACHINE) {
const char *ep, *cp;
@@
-397,8
+389,7
@@
static char *generate_header(const char *commit, const char *parent, const char
if (this_header[offset-1] != '\n')
this_header[offset++] = '\n';
/* Add _another_ EOLN if we are doing diff output */
if (this_header[offset-1] != '\n')
this_header[offset++] = '\n';
/* Add _another_ EOLN if we are doing diff output */
- if (!silent)
- this_header[offset++] = '\n';
+ this_header[offset++] = '\n';
this_header[offset] = 0;
}
this_header[offset] = 0;
}
@@
-444,8
+435,6
@@
static int diff_tree_commit(const unsigned char *commit, const char *name)
* Don't print multiple merge entries if we
* don't print the diffs.
*/
* Don't print multiple merge entries if we
* don't print the diffs.
*/
- if (silent)
- break;
}
offset += 48;
}
}
offset += 48;
}
@@
-475,7
+464,7
@@
static int diff_tree_stdin(char *line)
}
static char *diff_tree_usage =
}
static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v]
[-t]
<tree-ish> <tree-ish>";
int main(int argc, const char **argv)
{
int main(int argc, const char **argv)
{
@@
-510,6
+499,10
@@
int main(int argc, const char **argv)
recursive = 1;
continue;
}
recursive = 1;
continue;
}
+ if (!strcmp(arg, "-t")) {
+ recursive = show_tree_entry_in_recursive = 1;
+ continue;
+ }
if (!strcmp(arg, "-R")) {
reverse_diff = 1;
continue;
if (!strcmp(arg, "-R")) {
reverse_diff = 1;
continue;
@@
-542,7
+535,7
@@
int main(int argc, const char **argv)
continue;
}
if (!strcmp(arg, "-s")) {
continue;
}
if (!strcmp(arg, "-s")) {
-
silent = 1
;
+
diff_output_format = DIFF_FORMAT_NO_OUTPUT
;
continue;
}
if (!strcmp(arg, "-v")) {
continue;
}
if (!strcmp(arg, "-v")) {