projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/ident'
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
ec51e7d
..
804c08c
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-311,7
+311,7
@@
static int work_tree_matches(const char *name, const unsigned char *sha1)
ce = active_cache[pos];
if ((lstat(name, &st) < 0) ||
!S_ISREG(st.st_mode) || /* careful! */
ce = active_cache[pos];
if ((lstat(name, &st) < 0) ||
!S_ISREG(st.st_mode) || /* careful! */
- ce_match_stat(ce, &st) ||
+ ce_match_stat(ce, &st
, 0
) ||
memcmp(sha1, ce->sha1, 20))
return 0;
/* we return 1 only when we can stat, it is a regular file,
memcmp(sha1, ce->sha1, 20))
return 0;
/* we return 1 only when we can stat, it is a regular file,
@@
-963,7
+963,7
@@
void diff_free_filepair(struct diff_filepair *p)
}
/* This is different from find_unique_abbrev() in that
}
/* This is different from find_unique_abbrev() in that
- * it
needs to deal with 0{40} SHA1
.
+ * it
stuffs the result with dots for alignment
.
*/
const char *diff_unique_abbrev(const unsigned char *sha1, int len)
{
*/
const char *diff_unique_abbrev(const unsigned char *sha1, int len)
{
@@
-973,16
+973,8
@@
const char *diff_unique_abbrev(const unsigned char *sha1, int len)
return sha1_to_hex(sha1);
abbrev = find_unique_abbrev(sha1, len);
return sha1_to_hex(sha1);
abbrev = find_unique_abbrev(sha1, len);
- if (!abbrev) {
- if (!memcmp(sha1, null_sha1, 20)) {
- char *buf = sha1_to_hex(null_sha1);
- if (len < 37)
- strcpy(buf + len, "...");
- return buf;
- }
- else
- return sha1_to_hex(sha1);
- }
+ if (!abbrev)
+ return sha1_to_hex(sha1);
abblen = strlen(abbrev);
if (abblen < 37) {
static char hex[41];
abblen = strlen(abbrev);
if (abblen < 37) {
static char hex[41];