mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/diffcore'

Browse Source 
* jc/diffcore:
  diffcore-delta.c: Ignore CR in CRLF for text files
  diffcore-delta.c: update the comment on the algorithm.
  diffcore_filespec: add is_binary
  diffcore_count_changes: pass diffcore_filespec
This commit is contained in:
Junio C Hamano
2007-07-02 01:45:12 -07:00
parent 792d2370f9 b9905fed7a
commit e1bc8dc66d
6 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
diff.c
View File

@ -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)