diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 10:40:40 +0100 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-31 10:40:40 +0100 | 
| commit | c495cf02bac16e459f7c9e1740798646f12c00c5 (patch) | |
| tree | a36ba3904edd96ffc79fdf420fb10d33117a469f /ui-patch.c | |
| parent | Merge branch 'stable' (diff) | |
| download | cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.gz cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.tar.bz2 cgit-c495cf02bac16e459f7c9e1740798646f12c00c5.zip | |
Handle binary files in diffs
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch)
how to handle binary files.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | ui-patch.c | 9 | 
1 files changed, 8 insertions, 1 deletions
| @@ -57,6 +57,10 @@ static void header(unsigned char *sha1, char *path1, int mode1,  static void filepair_cb(struct diff_filepair *pair)  { +	unsigned long old_size = 0; +	unsigned long new_size = 0; +	int binary = 0; +  	header(pair->one->sha1, pair->one->path, pair->one->mode,  	       pair->two->sha1, pair->two->path, pair->two->mode);  	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { @@ -66,8 +70,11 @@ static void filepair_cb(struct diff_filepair *pair)  			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);  		return;  	} -	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) +	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, +			    &new_size, &binary, print_line))  		html("Error running diff"); +	if (binary) +		html("Binary files differ\n");  }  void cgit_print_patch(char *hex) | 
