Skip to content

Commit 1dd3c7d

Browse files
committed
few branch... tests have been failing sporadically due to the undefined rev order in rev-list (at least in git 2.22).
the fix: add --topo-order qualifier to the rev-list to make the order to be stable across different test. still failing tests: test/error.t (Wstat: 0 Tests: 17 Failed: 1) Failed test: 17 Parse errors: No plan found in TAP output test/pull-merge.t (Wstat: 0 Tests: 13 Failed: 1) Failed test: 8 test/push-after-init.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push-new-branch.t (Wstat: 0 Tests: 0 Failed: 0) Parse errors: No plan found in TAP output test/push.t (Wstat: 0 Tests: 17 Failed: 2) Failed tests: 3-4
1 parent ac8045f commit 1dd3c7d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/git-subrepo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ subrepo:branch() {
704704
local prev_commit=
705705
local ancestor=
706706
o "Create new commits with parents into the subrepo fetch"
707-
OUT=true RUN git rev-list --reverse --ancestry-path "$subrepo_parent..HEAD"
707+
OUT=true RUN git rev-list --reverse --ancestry-path --topo-order "$subrepo_parent..HEAD"
708708
local commit_list="$output"
709709
for commit in $commit_list; do
710710
o "Working on $commit"

0 commit comments

Comments
 (0)