Merge branch 'jc/diff-tree-stale-comment' into maint

Comment fix.

* jc/diff-tree-stale-comment:
  diff-tree: update stale in-code comments
This commit is contained in:
Junio C Hamano 2017-06-24 15:29:31 -07:00
commit b960cd37c6

View File

@ -128,9 +128,11 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
} }
/* /*
* NOTE! We expect "a ^b" to be equal to "a..b", so we * NOTE! We expect "a..b" to expand to "^a b" but it is
* reverse the order of the objects if the second one * perfectly valid for revision range parser to yield "b ^a",
* is marked UNINTERESTING. * which means the same thing. If we get the latter, i.e. the
* second one is marked UNINTERESTING, we recover the original
* order the user gave, i.e. "a..b", by swapping the trees.
*/ */
nr_sha1 = opt->pending.nr; nr_sha1 = opt->pending.nr;
switch (nr_sha1) { switch (nr_sha1) {