Merge branch 'sf/diff'
This commit is contained in:
commit
88f0d5d7d9
@ -94,5 +94,11 @@
|
|||||||
Swap two inputs; that is, show differences from index or
|
Swap two inputs; that is, show differences from index or
|
||||||
on-disk file to tree contents.
|
on-disk file to tree contents.
|
||||||
|
|
||||||
|
--text::
|
||||||
|
Treat all files as text.
|
||||||
|
|
||||||
|
-a::
|
||||||
|
Shorthand for "--text".
|
||||||
|
|
||||||
For more detailed explanation on these common options, see also
|
For more detailed explanation on these common options, see also
|
||||||
link:diffcore.html[diffcore documentation].
|
link:diffcore.html[diffcore documentation].
|
||||||
|
5
diff.c
5
diff.c
@ -729,7 +729,7 @@ static void builtin_diff(const char *name_a,
|
|||||||
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
|
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
|
||||||
die("unable to read files to diff");
|
die("unable to read files to diff");
|
||||||
|
|
||||||
if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2)) {
|
if (!o->text && (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2))) {
|
||||||
/* Quite common confusing case */
|
/* Quite common confusing case */
|
||||||
if (mf1.size == mf2.size &&
|
if (mf1.size == mf2.size &&
|
||||||
!memcmp(mf1.ptr, mf2.ptr, mf1.size))
|
!memcmp(mf1.ptr, mf2.ptr, mf1.size))
|
||||||
@ -1567,6 +1567,9 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||||||
options->output_format |= DIFF_FORMAT_PATCH;
|
options->output_format |= DIFF_FORMAT_PATCH;
|
||||||
options->full_index = options->binary = 1;
|
options->full_index = options->binary = 1;
|
||||||
}
|
}
|
||||||
|
else if (!strcmp(arg, "-a") || !strcmp(arg, "--text")) {
|
||||||
|
options->text = 1;
|
||||||
|
}
|
||||||
else if (!strcmp(arg, "--name-only"))
|
else if (!strcmp(arg, "--name-only"))
|
||||||
options->output_format |= DIFF_FORMAT_NAME;
|
options->output_format |= DIFF_FORMAT_NAME;
|
||||||
else if (!strcmp(arg, "--name-status"))
|
else if (!strcmp(arg, "--name-status"))
|
||||||
|
4
diff.h
4
diff.h
@ -42,6 +42,7 @@ struct diff_options {
|
|||||||
unsigned recursive:1,
|
unsigned recursive:1,
|
||||||
tree_in_recursive:1,
|
tree_in_recursive:1,
|
||||||
binary:1,
|
binary:1,
|
||||||
|
text:1,
|
||||||
full_index:1,
|
full_index:1,
|
||||||
silent_on_remove:1,
|
silent_on_remove:1,
|
||||||
find_copies_harder:1,
|
find_copies_harder:1,
|
||||||
@ -161,7 +162,8 @@ extern void diffcore_std_no_resolve(struct diff_options *);
|
|||||||
" -O<file> reorder diffs according to the <file>.\n" \
|
" -O<file> reorder diffs according to the <file>.\n" \
|
||||||
" -S<string> find filepair whose only one side contains the string.\n" \
|
" -S<string> find filepair whose only one side contains the string.\n" \
|
||||||
" --pickaxe-all\n" \
|
" --pickaxe-all\n" \
|
||||||
" show all files diff when -S is used and hit is found.\n"
|
" show all files diff when -S is used and hit is found.\n" \
|
||||||
|
" -a --text treat all files as text.\n"
|
||||||
|
|
||||||
extern int diff_queue_is_empty(void);
|
extern int diff_queue_is_empty(void);
|
||||||
extern void diff_flush(struct diff_options*);
|
extern void diff_flush(struct diff_options*);
|
||||||
|
Loading…
Reference in New Issue
Block a user