projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install archimport-script.
[git.git]
/
t
/
t6001-rev-list-merge-order.sh
diff --git
a/t/t6001-rev-list-merge-order.sh
b/t/t6001-rev-list-merge-order.sh
index
d93988d
..
7fe744e
100755
(executable)
--- a/
t/t6001-rev-list-merge-order.sh
+++ b/
t/t6001-rev-list-merge-order.sh
@@
-6,7
+6,14
@@
test_description='Tests git-rev-list --merge-order functionality'
. ./test-lib.sh
test_description='Tests git-rev-list --merge-order functionality'
. ./test-lib.sh
-. ../t6000-lib.sh # t6xxx specific functions
+. ../t6000lib.sh # t6xxx specific functions
+
+if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null
+then
+ test_expect_success 'skipping merge-order test' :
+ test_done
+ exit
+fi
# test-case specific test function
check_adjacency()
# test-case specific test function
check_adjacency()
@@
-103,15
+110,6
@@
save_tag g4 unique_commit g6 tree -p g3 -p h2
tag l5 > .git/HEAD
tag l5 > .git/HEAD
-#
-# cd to t/trash and use
-#
-# git-rev-list ... 2>&1 | sed "$(cat sed.script)"
-#
-# if you ever want to manually debug the operation of git-rev-list
-#
-echo $sed_script > sed.script
-
test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
19
EOF
test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
19
EOF
@@
-438,6
+436,26
@@
a2
a1
EOF
a1
EOF
+test_output_expect_success "--merge-order a4 l3" "git-rev-list --merge-order a4 l3" <<EOF
+l3
+a4
+c3
+c2
+c1
+b4
+b3
+b2
+b1
+a3
+a2
+a1
+a0
+l2
+l1
+l0
+root
+EOF
+
#
#
#
#