diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:55:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:55:50 -0800 |
| commit | 39add7a36feca434ba85267cb76e4fd69bcdc13a (patch) | |
| tree | 3fe3b7f5b5514152c9c2223f30020dce9b7f311d /diff-lib.c | |
| parent | 885d492f69a80ae3e91c1310a63caf0aeb567f2a (diff) | |
| parent | 353c5eeb5cad63218ca796352cce9986df7b9c62 (diff) | |
| download | git-39add7a36feca434ba85267cb76e4fd69bcdc13a.tar.gz | |
Merge branch 'jc/fix-tree-walk' (early part)
* 'jc/fix-tree-walk' (early part):
unpack_callback(): use unpack_failed() consistently
unpack-trees: typofix
diff-lib.c: fix misleading comments on oneway_diff()
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 0c74ef5cbe..adf1c5fdee 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 |