Source: git-reintegrate Version: 0.4-2.1 Severity: serious Justification: FTBFS Tags: trixie sid ftbfs User: lu...@debian.org Usertags: ftbfs-20250124 ftbfs-trixie
Hi, During a rebuild of all packages in sid, your package failed to build on amd64. Relevant part (hopefully): > make[2]: Entering directory > '/build/reproducible-path/git-reintegrate-0.4/test' > /bin/sh apply.t > /bin/sh conflicts.t > /bin/sh fixup.t > /bin/sh reintegrate.t > ok 1 - setup branches > ok 1 - setup branches > ok 1 - setup branches > ok 1 - setup branches > ok 2 - create integration branch > ok 2 - create integration branch > ok 2 - create integration branch > not ok 3 - conflict in last branch resolved > # > # test_must_fail git reintegrate --rebuild && > # git merge-base --is-ancestor branch1 HEAD && > # test_must_fail git merge-base --is-ancestor branch2 HEAD && > # echo resolved > base && > # git add base && > # git reintegrate --continue > output && > # cat output && > # grep -q branch2 output && > # git merge-base --is-ancestor branch2 HEAD > # > ok 3 - rebuild with fixup added > ok 4 - check fixup applied > ok 5 - check fixup squashed > # passed all 5 test(s) > 1..5 > ok 2 - generate integration > ok 3 - add branches to integration branch > ok 3 - update integration > not ok 4 - conflict in last branch try continue when unresolved > # > # test_must_fail git reintegrate --rebuild && > # git merge-base --is-ancestor branch1 HEAD && > # test_must_fail git merge-base --is-ancestor branch2 HEAD && > # test_must_fail git reintegrate --continue && > # echo resolved > base && > # git add base && > # git reintegrate --continue > output && > # cat output && > # grep -q branch2 output && > # git merge-base --is-ancestor branch2 HEAD > # > not ok 5 - conflict in last branch and abort > # > # git checkout pu && > # git reset --hard master && > # test_must_fail git reintegrate --rebuild && > # git merge-base --is-ancestor branch1 HEAD && > # test_must_fail git merge-base --is-ancestor branch2 HEAD && > # git reintegrate --abort && > # git rev-parse --verify master > expect && > # git rev-parse --verify pu > actual && > # test_cmp expect actual && > # echo refs/heads/pu > expect && > # git symbolic-ref HEAD > actual && > # test_cmp expect actual && > # test_must_fail git merge-base --is-ancestor branch1 HEAD && > # test_must_fail git merge-base --is-ancestor branch2 HEAD > # > not ok 6 - abort does not move other branches > # > # git checkout pu && > # git reset --hard master && > # git rev-parse --verify branch1 > expect && > # test_must_fail git reintegrate --rebuild && > # git checkout --force branch1 && > # git reintegrate --abort && > # git rev-parse --verify branch1 > actual && > # test_cmp expect actual > # > not ok 7 - conflict in middle branch > # > # git checkout -b branch4 master && > # commit_file b4 b4 && > # git checkout pu && > # GIT_EDITOR=.git/EDITOR git reintegrate --edit && > # test_must_fail git reintegrate --rebuild && > # git merge-base --is-ancestor branch1 HEAD && > # test_must_fail git merge-base --is-ancestor branch2 HEAD && > # echo resolved > base && > # git add base && > # git reintegrate --continue > output && > # cat output && > # grep -q branch2 output && > # grep -q branch3 output && > # git merge-base --is-ancestor branch2 HEAD && > # git merge-base --is-ancestor branch3 HEAD > # > # failed 5 among 7 test(s) > 1..7 > make[2]: *** [Makefile:11: conflicts.t] Error 1 > make[2]: *** Waiting for unfinished jobs.... > ok 4 - apply pending > # passed all 4 test(s) > 1..4 > ok 4 - add another branch and rebuild > ok 5 - do not create empty commits > ok 6 - generate instructions > ok 7 - empty commit > not ok 8 - pause command > # > # GIT_EDITOR=.git/EDITOR git reintegrate --edit pu && > # test_must_fail git reintegrate --rebuild pu && > # check_int pu <<-EOF && > # branch2: > # branch1: > # EOF > # git reintegrate --continue && > # check_int pu <<-EOF > # branch3: > # branch2: > # branch1: > # EOF > # > # failed 1 among 8 test(s) > 1..8 > make[2]: *** [Makefile:11: reintegrate.t] Error 1 > make[2]: Leaving directory '/build/reproducible-path/git-reintegrate-0.4/test' > make[1]: *** [Makefile:11: test] Error 2 > make[1]: Leaving directory '/build/reproducible-path/git-reintegrate-0.4' > dh_auto_test: error: make -j8 test returned exit code 2 The full build log is available from: http://qa-logs.debian.net/2025/01/24/git-reintegrate_0.4-2.1_unstable.log All bugs filed during this archive rebuild are listed at: https://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=ftbfs-20250124;users=lu...@debian.org or: https://udd.debian.org/bugs/?release=na&merged=ign&fnewerval=7&flastmodval=7&fusertag=only&fusertagtag=ftbfs-20250124&fusertaguser=lu...@debian.org&allbugs=1&cseverity=1&ctags=1&caffected=1#results A list of current common problems and possible solutions is available at http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute! If you reassign this bug to another package, please mark it as 'affects'-ing this package. See https://www.debian.org/Bugs/server-control#affects If you fail to reproduce this, please provide a build log and diff it with mine so that we can identify if something relevant changed in the meantime.
