summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-25 17:51:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-25 19:40:51 -0700
commitc3502fa8822fab99ee51b3f74cf3f100492d88e2 (patch)
tree055e059da56a9e78ece64250562bb04ebed1cdba /t
parentrevision: keep track of the end-user input from the command line (diff)
downloadtgif-c3502fa8822fab99ee51b3f74cf3f100492d88e2.tar.xz
revision: do not include sibling history in --ancestry-path output
If the commit specified as the bottom of the commit range has a direct parent that has another child commit that contributed to the resulting history, "rev-list --ancestry-path" was confused and listed that side history as well, due to the command line parser subtlety corrected by the previous commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t6019-rev-list-ancestry-path.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index aa4674f1df..738af73393 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -99,7 +99,7 @@ test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
'
# no commits in repository descend from cb
-test_expect_failure 'criss-cross: rev-list --ancestry-path --all ^cb' '
+test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
(cd criss-cross &&
git rev-list --ancestry-path --all ^cb > actual &&
test -z "$(cat actual)")