From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Sep 2009 05:12:17 +0000 (-0700)
Subject: diff-lib.c: fix misleading comments on oneway_diff()
X-Git-Tag: v1.6.6-rc0~20^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=da8ba5e7da01be597aa9417c563dbd516ea5f204;p=git.git

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 <gitster@pobox.com>
---

diff --git a/diff-lib.c b/diff-lib.c
index 0c74ef5cb..adf1c5fde 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