summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79b4fde)
raw | patch | inline | side by side (parent: 79b4fde)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 18 Sep 2009 05:12:17 +0000 (22:12 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 11 Oct 2009 23:40:43 +0000 (16:40 -0700) |
20a16eb (unpack_trees(): fix diff-index regression., 2008-03-10) adjusted
diff-index to the new world order since 34110cd (Make 'unpack_trees()'
have a separate source and destination index, 2008-03-06). Callbacks are
expected to return anything non-negative as "success", and instead of
reporting how many index entries they have processed, they are expected to
advance o->pos themselves. The code did so, but a stale comment was left
behind.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-index to the new world order since 34110cd (Make 'unpack_trees()'
have a separate source and destination index, 2008-03-06). Callbacks are
expected to return anything non-negative as "success", and instead of
reporting how many index entries they have processed, they are expected to
advance o->pos themselves. The code did so, but a stale comment was left
behind.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c | patch | blob | history |
diff --git a/diff-lib.c b/diff-lib.c
index 0c74ef5cbe9ae0b43d8eaeb3249e4f83c695920b..adf1c5fdee2bc836f03eaa89160573973bb46a67 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -383,7 +383,7 @@ static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_op
* For diffing, the index is more important, and we only have a
* single tree.
*
- * We're supposed to return how many index entries we want to skip.
+ * We're supposed to advance o->pos to skip what we have already processed.
*
* This wrapper makes it all more readable, and takes care of all
* the fairly complex unpack_trees() semantic requirements, including