projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire git-clone-dumb-http.
[git.git]
/
diff-files.c
diff --git
a/diff-files.c
b/diff-files.c
index
4e7d967
..
89eb29b
100644
(file)
--- a/
diff-files.c
+++ b/
diff-files.c
@@
-6,12
+6,13
@@
#include "cache.h"
#include "diff.h"
#include "cache.h"
#include "diff.h"
-static const char
*diff_files_usage
=
+static const char
diff_files_usage[]
=
"git-diff-files [-q] "
"[<common diff options>] [<path>...]"
COMMON_DIFF_OPTIONS_HELP;
"git-diff-files [-q] "
"[<common diff options>] [<path>...]"
COMMON_DIFF_OPTIONS_HELP;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
static int detect_rename = 0;
static int find_copies_harder = 0;
static int diff_setup_opt = 0;
static int detect_rename = 0;
static int find_copies_harder = 0;
static int diff_setup_opt = 0;
@@
-40,12
+41,12
@@
static void show_modified(int oldmode, int mode,
diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
}
diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
}
-int main(int argc, c
onst c
har **argv)
+int main(int argc, char **argv)
{
static const unsigned char null_sha1[20] = { 0, };
const char **pathspec;
{
static const unsigned char null_sha1[20] = { 0, };
const char **pathspec;
-
int entries = read_cache
();
- int i;
+
const char *prefix = setup_git_directory
();
+ int
entries,
i;
while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
@@
-57,11
+58,9
@@
int main(int argc, const char **argv)
else if (!strcmp(argv[1], "-s"))
; /* no-op */
else if (!strcmp(argv[1], "-z"))
else if (!strcmp(argv[1], "-s"))
; /* no-op */
else if (!strcmp(argv[1], "-z"))
- diff_
output_format = DIFF_FORMAT_MACHINE
;
+ diff_
line_termination = 0
;
else if (!strcmp(argv[1], "--name-only"))
diff_output_format = DIFF_FORMAT_NAME;
else if (!strcmp(argv[1], "--name-only"))
diff_output_format = DIFF_FORMAT_NAME;
- else if (!strcmp(argv[1], "--name-only-z"))
- diff_output_format = DIFF_FORMAT_NAME_Z;
else if (!strcmp(argv[1], "-R"))
diff_setup_opt |= DIFF_SETUP_REVERSE;
else if (!strncmp(argv[1], "-S", 2))
else if (!strcmp(argv[1], "-R"))
diff_setup_opt |= DIFF_SETUP_REVERSE;
else if (!strncmp(argv[1], "-S", 2))
@@
-96,8
+95,9
@@
int main(int argc, const char **argv)
argv++; argc--;
}
argv++; argc--;
}
- /* Do we have a pathspec? */
- pathspec = (argc > 1) ? argv + 1 : NULL;
+ /* Find the directory, and set up the pathspec */
+ pathspec = get_pathspec(prefix, argv + 1);
+ entries = read_cache();
if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
usage(diff_files_usage);
if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
usage(diff_files_usage);
@@
-153,6
+153,6
@@
int main(int argc, const char **argv)
pickaxe, pickaxe_opts,
diff_break_opt,
orderfile, diff_filter);
pickaxe, pickaxe_opts,
diff_break_opt,
orderfile, diff_filter);
- diff_flush(diff_output_format);
+ diff_flush(diff_output_format
, diff_line_termination
);
return 0;
}
return 0;
}