projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Propagate errors from fetch-pack correctly to git-fetch.
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
527cbf0
..
f8e3cbf
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-32,10
+32,10
@@
static const char *external_diff(void)
*
* GIT_DIFF_OPTS="-c";
*/
*
* GIT_DIFF_OPTS="-c";
*/
- external_diff_cmd = g
i
tenv("GIT_EXTERNAL_DIFF");
+ external_diff_cmd = g
e
tenv("GIT_EXTERNAL_DIFF");
/* In case external diff fails... */
/* In case external diff fails... */
- env_diff_opts = g
i
tenv("GIT_DIFF_OPTS");
+ env_diff_opts = g
e
tenv("GIT_DIFF_OPTS");
if (env_diff_opts) diff_opts = env_diff_opts;
done_preparing = 1;
if (env_diff_opts) diff_opts = env_diff_opts;
done_preparing = 1;
@@
-955,7
+955,9
@@
static void diff_resolve_rename_copy(void)
}
/* See if there is some other filepair that
* copies from the same source as us. If so
}
/* See if there is some other filepair that
* copies from the same source as us. If so
- * we are a copy. Otherwise we are a rename.
+ * we are a copy. Otherwise we are either a
+ * copy if the path stays, or a rename if it
+ * does not, but we already handled "stays" case.
*/
for (j = i + 1; j < q->nr; j++) {
pp = q->queue[j];
*/
for (j = i + 1; j < q->nr; j++) {
pp = q->queue[j];