Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diffcore-rename: use is_empty_blob_oid
author
Brandon Williams
<bmwill@google.com>
Tue, 30 May 2017 17:31:08 +0000
(10:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Jun 2017 02:23:58 +0000
(11:23 +0900)
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-rename.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
0e72462
)
diff --git
a/diffcore-rename.c
b/diffcore-rename.c
index 3d9719dadcb4c3ce78e3151680692d4bee25200d..03d1e8d40bb78d03c6b7257b05275de739693671 100644
(file)
--- a/
diffcore-rename.c
+++ b/
diffcore-rename.c
@@
-464,7
+464,7
@@
void diffcore_rename(struct diff_options *options)
strcmp(options->single_follow, p->two->path))
continue; /* not interested */
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
strcmp(options->single_follow, p->two->path))
continue; /* not interested */
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_
sha1(p->two->oid.hash
))
+ is_empty_blob_
oid(&p->two->oid
))
continue;
else if (add_rename_dst(p->two) < 0) {
warning("skipping rename detection, detected"
continue;
else if (add_rename_dst(p->two) < 0) {
warning("skipping rename detection, detected"
@@
-474,7
+474,7
@@
void diffcore_rename(struct diff_options *options)
}
}
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
}
}
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_
sha1(p->one->oid.hash
))
+ is_empty_blob_
oid(&p->one->oid
))
continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/*
continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/*