path: root/diff-lib.c
diff options
authorJunio C Hamano <>2009-09-18 05:12:17 (GMT)
committerJunio C Hamano <>2009-10-11 23:40:43 (GMT)
commitda8ba5e7da01be597aa9417c563dbd516ea5f204 (patch)
tree8bae7916d0633470b0a6d8dcb0f9fdf49ae8b420 /diff-lib.c
parent79b4fde573eb5e86a8109d100ad182be1eb5fc54 (diff)
diff-lib.c: fix misleading comments on oneway_diff()
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 <>
Diffstat (limited to 'diff-lib.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c
index 0c74ef5..adf1c5f 100644
--- 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