summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-29 05:56:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-01 03:51:31 (GMT)
commit706098af6b53403b5ea3db9216fb99afbe06f52d (patch)
treed433db47ca354e5de3c229066e96c413ab33a976 /diff.c
parentd8c3d03a0b7f10977dd508a5a965a417b7f1b065 (diff)
downloadgit-706098af6b53403b5ea3db9216fb99afbe06f52d.zip
git-706098af6b53403b5ea3db9216fb99afbe06f52d.tar.gz
git-706098af6b53403b5ea3db9216fb99afbe06f52d.tar.bz2
diffcore_filespec: add is_binary
diffcore-break and diffcore-rename would want to behave slightly differently depending on the binary-ness of the data, so add one bit to the filespec, as the structure is now passed down to diffcore_count_changes() function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 9938969..74c1198 100644
--- a/diff.c
+++ b/diff.c
@@ -3005,6 +3005,22 @@ void diffcore_std(struct diff_options *options)
{
if (options->quiet)
return;
+
+ /*
+ * break/rename count similarity differently depending on
+ * the binary-ness.
+ */
+ if ((options->break_opt != -1) || (options->detect_rename)) {
+ struct diff_queue_struct *q = &diff_queued_diff;
+ int i;
+
+ for (i = 0; i < q->nr; i++) {
+ struct diff_filepair *p = q->queue[i];
+ p->one->is_binary = file_is_binary(p->one);
+ p->two->is_binary = file_is_binary(p->two);
+ }
+ }
+
if (options->break_opt != -1)
diffcore_break(options->break_opt);
if (options->detect_rename)