summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-13 20:47:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-13 20:47:09 (GMT)
commit42e731c7826236d92557d8b1c64e4f38ee21a766 (patch)
tree96152b80e66ac165a9196043c9a060dccafd659b
parent3c548de3788eda31388b435d8983866fe43e032f (diff)
parent8ba74bfd7c7e11454a15ed6360777e702c438846 (diff)
downloadgit-42e731c7826236d92557d8b1c64e4f38ee21a766.zip
git-42e731c7826236d92557d8b1c64e4f38ee21a766.tar.gz
git-42e731c7826236d92557d8b1c64e4f38ee21a766.tar.bz2
Merge branch 'jc/diff-tree-stale-comment'
Comment fix. * jc/diff-tree-stale-comment: diff-tree: update stale in-code comments
-rw-r--r--builtin/diff-tree.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index e401112..492245f 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -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
- * reverse the order of the objects if the second one
- * is marked UNINTERESTING.
+ * NOTE! We expect "a..b" to expand to "^a b" but it is
+ * perfectly valid for revision range parser to yield "b ^a",
+ * 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;
switch (nr_sha1) {