Skip to main content

Browse the archive

Revision 12426e114b252d130d83c3f098c4ceae3cf217e3 authored by Junio C Hamano on 01 March 2017, 17:04:44 UTC, committed by Junio C Hamano on 02 March 2017, 18:48:06 UTC 
diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
 
Callers of diff_populate_filespec() can choose to ask only for the
size of the blob without grabbing the blob data, and the function,
after running lstat() when the filespec points at a working tree
file, returns by copying the value in size field of the stat
structure into the size field of the filespec when this is the case.

However, this short-cut cannot be taken if the contents from the
path needs to go through convert_to_git(), whose resulting real blob
data may be different from what is in the working tree file.

As "git diff --quiet" compares the .size fields of filespec
structures to skip content comparison, this bug manifests as a
false "there are differences" for a file that needs eol conversion,
for example.

Reported-by: Mike Crowe <mac@mcrowe.com>
Helped-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 0b65a8d
Raw File
shortlog.h 
#ifndef SHORTLOG_H
#define SHORTLOG_H

#include "string-list.h"

struct shortlog {
	struct string_list list;
	int summary;
	int wrap_lines;
	int sort_by_number;
	int wrap;
	int in1;
	int in2;
	int user_format;
	int abbrev;

	char *common_repo_prefix;
	int email;
	struct string_list mailmap;
};

void shortlog_init(struct shortlog *log);

void shortlog_add_commit(struct shortlog *log, struct commit *commit);

void shortlog_output(struct shortlog *log);

#endif
back to top