Diff of the two buildlogs: -- --- b1/build.log 2024-12-04 07:12:52.860251746 +0000 +++ b2/build.log 2024-12-04 07:13:45.373873492 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Tue Jan 6 01:35:05 -12 2026 -I: pbuilder-time-stamp: 1767706505 +I: Current time: Wed Jan 7 03:35:55 +14 2026 +I: pbuilder-time-stamp: 1767706555 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -26,52 +26,84 @@ dpkg-source: info: unpacking git-delete-merged-branches_7.4.1-1.debian.tar.xz I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/1699798/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/D01_modify_environment starting +debug: Running on codethink01-arm64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Jan 6 13:36 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='arm64' - DEBIAN_FRONTEND='noninteractive' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="32" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu") + BASH_VERSION='5.2.32(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=arm64 + DEBIAN_FRONTEND=noninteractive DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='ea815cdbf6444177be26660d65890429' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='1699798' - PS1='# ' - PS2='> ' + INVOCATION_ID=fe71169b547b4f5ca55513f3d0c979c6 + LANG=C + LANGUAGE=nl_BE:nl + LC_ALL=C + MACHTYPE=aarch64-unknown-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=1245529 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.6fhe6pZk/pbuilderrc_gBaV --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.6fhe6pZk/b1 --logfile b1/build.log git-delete-merged-branches_7.4.1-1.dsc' - SUDO_GID='109' - SUDO_UID='104' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://192.168.101.4:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.6fhe6pZk/pbuilderrc_xK0Q --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.6fhe6pZk/b2 --logfile b2/build.log git-delete-merged-branches_7.4.1-1.dsc' + SUDO_GID=109 + SUDO_UID=104 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://192.168.101.4:3128 I: uname -a - Linux codethink03-arm64 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux I: ls -l /bin lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/1699798/tmp/hooks/D02_print_environment finished +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -210,7 +242,7 @@ Get: 85 http://deb.debian.org/debian unstable/main arm64 python3-parameterized all 0.9.0-2 [20.2 kB] Get: 86 http://deb.debian.org/debian unstable/main arm64 python3-wcwidth all 0.2.13+dfsg1-1 [24.9 kB] Get: 87 http://deb.debian.org/debian unstable/main arm64 python3-prompt-toolkit all 3.0.48-1 [277 kB] -Fetched 45.4 MB in 0s (184 MB/s) +Fetched 45.4 MB in 0s (163 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.12-minimal:arm64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 20086 files and directories currently installed.) @@ -509,8 +541,8 @@ Setting up tzdata (2024b-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Tue Jan 6 13:35:24 UTC 2026. -Universal Time is now: Tue Jan 6 13:35:24 UTC 2026. +Local time is now: Tue Jan 6 13:36:13 UTC 2026. +Universal Time is now: Tue Jan 6 13:36:13 UTC 2026. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -587,7 +619,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/git-delete-merged-branches-7.4.1/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../git-delete-merged-branches_7.4.1-1_source.changes +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-delete-merged-branches-7.4.1/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../git-delete-merged-branches_7.4.1-1_source.changes dpkg-buildpackage: info: source package git-delete-merged-branches dpkg-buildpackage: info: source version 7.4.1-1 dpkg-buildpackage: info: source distribution unstable @@ -770,11 +806,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpmxjfm4ue/.git/ +Initialized empty Git repository in /tmp/tmpbplxwqhl/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) bc6bc8b] Add file.txt with one line +[master (root-commit) 31cb064] Add file.txt with one line Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file.txt @@ -783,7 +819,7 @@ Switched to a new branch 'merged2' + echo line2 + git commit -a -m 'Add line 2' -[merged2 d0d97f3] Add line 2 +[merged2 2f43edd] Add line 2 Author: Author One 1 file changed, 1 insertion(+) + git checkout master @@ -796,7 +832,7 @@ Switched to a new branch 'not-merged1' + echo line3 + git commit -a -m 'Add line 3' -[not-merged1 f1aff31] Add line 3 +[not-merged1 bdd6890] Add line 3 Author: Author One 1 file changed, 1 insertion(+) # git branch @@ -823,11 +859,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpknu0cxxq/.git/ +Initialized empty Git repository in /tmp/tmp7gcay4o8/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) af47f8a] Add file1.txt +[master (root-commit) 48d14c7] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -836,14 +872,14 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged1 4c2cc30] Add file2.txt +[defacto-merged1 c08b956] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged1 5d924b0] Add file3.txt +[defacto-merged1 84469cb] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt @@ -852,14 +888,14 @@ + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged2 935cce7] Add file3.txt +[defacto-merged2 19972b9] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged2 773f28a] Add file2.txt +[defacto-merged2 a9fbe2d] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt @@ -868,19 +904,19 @@ + cp file1.txt file4.txt + git add file4.txt + git commit -m 'Add file4.txt' -[master 95fb4d0] Add file4.txt +[master ebd1cb9] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master 04c958d] Add file2.txt +[master f07e4c0] Add file2.txt Author: Author One - Date: Tue Jan 6 01:35:44 2026 -1200 + Date: Wed Jan 7 03:36:36 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master 3365836] Add file3.txt +[master 9888987] Add file3.txt Author: Author One - Date: Tue Jan 6 01:35:44 2026 -1200 + Date: Wed Jan 7 03:36:36 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b not-defacto-merged1 defacto-merged1 @@ -888,7 +924,7 @@ + cp file1.txt file5.txt + git add file5.txt + git commit -m 'Add file5.txt' -[not-defacto-merged1 8fbf96e] Add file5.txt +[not-defacto-merged1 b43bd6b] Add file5.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file5.txt @@ -920,11 +956,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp0h9i2eix/.git/ +Initialized empty Git repository in /tmp/tmp48z9whtg/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) af47f8a] Add file1.txt +[master (root-commit) 48d14c7] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -933,35 +969,35 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-squash-merged1 4c2cc30] Add file2.txt +[defacto-squash-merged1 c08b956] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-squash-merged1 5d924b0] Add file3.txt +[defacto-squash-merged1 84469cb] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b defacto-squash-merged2 Switched to a new branch 'defacto-squash-merged2' + git revert --no-edit HEAD -[defacto-squash-merged2 3843574] Revert "Add file3.txt" +[defacto-squash-merged2 b54b762] Revert "Add file3.txt" Author: Author One - Date: Tue Jan 6 01:35:44 2026 -1200 + Date: Wed Jan 7 03:36:36 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 1240d6c] Reapply "Add file3.txt" +[defacto-squash-merged2 927b803] Reapply "Add file3.txt" Author: Author One - Date: Tue Jan 6 01:35:44 2026 -1200 + Date: Wed Jan 7 03:36:36 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout master Switched to branch 'master' + git merge --squash defacto-squash-merged1 -Updating af47f8a..5d924b0 +Updating 48d14c7..84469cb Fast-forward Squash commit -- not updating HEAD file2.txt | 1 + @@ -970,7 +1006,7 @@ create mode 100644 file2.txt create mode 100644 file3.txt + git commit -m 'Add squashed copy of '\''defacto-squash-merged1'\''' -[master 0598e4b] Add squashed copy of 'defacto-squash-merged1' +[master ab29174] Add squashed copy of 'defacto-squash-merged1' Author: Author One 2 files changed, 2 insertions(+) create mode 100644 file2.txt @@ -978,9 +1014,9 @@ + git checkout -b not-defacto-squash-merged1 Switched to a new branch 'not-defacto-squash-merged1' + git revert --no-edit HEAD -[not-defacto-squash-merged1 e9f4a04] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 5778eb7] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Tue Jan 6 01:35:44 2026 -1200 + Date: Wed Jan 7 03:36:36 2026 +1400 2 files changed, 2 deletions(-) delete mode 100644 file2.txt delete mode 100644 file3.txt @@ -994,11 +1030,11 @@ # git diff --exit-code --quiet # git diff --exit-code --quiet --cached # git merge-base master defacto-squash-merged1 -# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p af47f8a932f9879ec450e434064356b03a55d5cc 'defacto-squash-merged1^{tree}' -# git cherry master cfc566f279f9434dc40ff1cbc25f8263b8f9baff +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 48d14c75a4e33ccb0f9eb58b4ab7b760ef63d5f2 'defacto-squash-merged1^{tree}' +# git cherry master 8e0bda4548b35f7ec4017e956b80b99487b854c4 # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p af47f8a932f9879ec450e434064356b03a55d5cc 'defacto-squash-merged2^{tree}' -# git cherry master b936adbc71da91e45fd8a6e1229ed68deb545eb9 +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 48d14c75a4e33ccb0f9eb58b4ab7b760ef63d5f2 'defacto-squash-merged2^{tree}' +# git cherry master f975a5c8bdcf8b804cc22115d9c4a0aae611c491 ok test_refresh_gets_branches_back_in_sync (git_delete_merged_branches.tests.test_engine.RefreshTargetBranchesTest.test_refresh_gets_branches_back_in_sync) ... + export HOME= + HOME= @@ -1023,9 +1059,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpuh6vzpg8/upstream/.git/ +Initialized empty Git repository in /tmp/tmp0skaod5w/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) c48261b] Dummy commit #1 +[master (root-commit) 8893588] Dummy commit #1 Author: Author One + git branch pull-works + git branch pull-trouble @@ -1034,7 +1070,7 @@ + echo line1 + git add collision.txt + git commit -m 'Add collision.txt' -[checkout-trouble e50f92d] Add collision.txt +[checkout-trouble 8d995a9] Add collision.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 collision.txt @@ -1056,7 +1092,7 @@ + git checkout pull-trouble Switched to branch 'pull-trouble' + git merge --ff checkout-trouble -Updating c48261b..e50f92d +Updating 8893588..8d995a9 Fast-forward collision.txt | 1 + 1 file changed, 1 insertion(+) @@ -1064,7 +1100,7 @@ + git checkout pull-works Switched to branch 'pull-works' + git commit --allow-empty -m 'Dummy commit #2' -[pull-works 939d7d1] Dummy commit #2 +[pull-works eedafb7] Dummy commit #2 Author: Author One + cd .. + cd downstream @@ -1074,9 +1110,9 @@ # git rev-parse --symbolic-full-name HEAD # git branch # git remote update --prune upstream -From /tmp/tmpuh6vzpg8/upstream - c48261b..e50f92d pull-trouble -> upstream/pull-trouble - c48261b..939d7d1 pull-works -> upstream/pull-works +From /tmp/tmp0skaod5w/upstream + 8893588..8d995a9 pull-trouble -> upstream/pull-trouble + 8893588..eedafb7 pull-works -> upstream/pull-works # git cherry pull-works upstream/pull-works # git rev-parse --symbolic-full-name HEAD # git worktree list --porcelain @@ -1111,7 +1147,7 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp6jm_oeku/.git/ +Initialized empty Git repository in /tmp/tmp1e6bu8mp/.git/ ok test (git_delete_merged_branches.tests.test_git.FindBranchNamesTest.test) ... ok test_find_branches_drops_head (git_delete_merged_branches.tests.test_git.FindBranchesTest.test_find_branches_drops_head) ... ok @@ -1134,7 +1170,7 @@ + GIT_COMMITTER_NAME='Committer Two' + mkdir upstream + pushd upstream -/tmp/tmpbwioep4t/upstream /tmp/tmpbwioep4t +/tmp/tmpzaz9z7bn/upstream /tmp/tmpzaz9z7bn + git init hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all @@ -1146,20 +1182,20 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpbwioep4t/upstream/.git/ +Initialized empty Git repository in /tmp/tmpzaz9z7bn/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 2ca4db7] First commit +[master (root-commit) 07a1e58] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmpbwioep4t +/tmp/tmpzaz9z7bn + git clone upstream downstream Cloning into 'downstream'... done. # git branch --remote --list 'origin/*' # git push --delete --force-with-lease origin refs/heads/1.0.0 -To /tmp/tmpbwioep4t/upstream +To /tmp/tmpzaz9z7bn/upstream - [deleted] 1.0.0 # git branch --remote --list 'origin/*' ok @@ -1169,7 +1205,7 @@ test_3_tick_tick_ (git_delete_merged_branches.tests.test_shell.ShellEscapingTest.test_3_tick_tick_) ... ok ---------------------------------------------------------------------- -Ran 30 tests in 0.757s +Ran 30 tests in 0.823s OK I: pybuild base:311: cd /build/reproducible-path/git-delete-merged-branches-7.4.1/.pybuild/cpython3_3.12/build; python3.12 -m unittest discover -v @@ -1205,11 +1241,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmphh5d8s8u/.git/ +Initialized empty Git repository in /tmp/tmpm5bvp__a/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) 2e82124] Add file.txt with one line +[master (root-commit) f88f574] Add file.txt with one line Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file.txt @@ -1218,7 +1254,7 @@ Switched to a new branch 'merged2' + echo line2 + git commit -a -m 'Add line 2' -[merged2 9a41b54] Add line 2 +[merged2 97cb159] Add line 2 Author: Author One 1 file changed, 1 insertion(+) + git checkout master @@ -1231,7 +1267,7 @@ Switched to a new branch 'not-merged1' + echo line3 + git commit -a -m 'Add line 3' -[not-merged1 d9577e8] Add line 3 +[not-merged1 7eca805] Add line 3 Author: Author One 1 file changed, 1 insertion(+) # git branch @@ -1258,11 +1294,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpaoq3pua4/.git/ +Initialized empty Git repository in /tmp/tmpdbt6vguu/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) 71054c1] Add file1.txt +[master (root-commit) 1c2167c] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -1271,14 +1307,14 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged1 0761ce6] Add file2.txt +[defacto-merged1 119d1aa] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged1 3af1672] Add file3.txt +[defacto-merged1 a927090] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt @@ -1287,14 +1323,14 @@ + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged2 31efae7] Add file3.txt +[defacto-merged2 b92c03e] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged2 4cf8b2e] Add file2.txt +[defacto-merged2 10b56dc] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt @@ -1303,19 +1339,19 @@ + cp file1.txt file4.txt + git add file4.txt + git commit -m 'Add file4.txt' -[master 605214d] Add file4.txt +[master cb1042d] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master 7565537] Add file2.txt +[master 8465c0f] Add file2.txt Author: Author One - Date: Tue Jan 6 01:35:45 2026 -1200 + Date: Wed Jan 7 03:36:37 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master fa7c1e2] Add file3.txt +[master 025222d] Add file3.txt Author: Author One - Date: Tue Jan 6 01:35:45 2026 -1200 + Date: Wed Jan 7 03:36:37 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b not-defacto-merged1 defacto-merged1 @@ -1323,7 +1359,7 @@ + cp file1.txt file5.txt + git add file5.txt + git commit -m 'Add file5.txt' -[not-defacto-merged1 b3fa9c6] Add file5.txt +[not-defacto-merged1 6ce72b3] Add file5.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file5.txt @@ -1355,11 +1391,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpviu3et9t/.git/ +Initialized empty Git repository in /tmp/tmpzv3lzi37/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) 71054c1] Add file1.txt +[master (root-commit) 1c2167c] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -1368,35 +1404,35 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-squash-merged1 0761ce6] Add file2.txt +[defacto-squash-merged1 119d1aa] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-squash-merged1 3af1672] Add file3.txt +[defacto-squash-merged1 a927090] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b defacto-squash-merged2 Switched to a new branch 'defacto-squash-merged2' + git revert --no-edit HEAD -[defacto-squash-merged2 a4b485c] Revert "Add file3.txt" +[defacto-squash-merged2 c7afea2] Revert "Add file3.txt" Author: Author One - Date: Tue Jan 6 01:35:45 2026 -1200 + Date: Wed Jan 7 03:36:37 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 6ef1c63] Reapply "Add file3.txt" +[defacto-squash-merged2 ec5eb90] Reapply "Add file3.txt" Author: Author One - Date: Tue Jan 6 01:35:45 2026 -1200 + Date: Wed Jan 7 03:36:37 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout master Switched to branch 'master' + git merge --squash defacto-squash-merged1 -Updating 71054c1..3af1672 +Updating 1c2167c..a927090 Fast-forward Squash commit -- not updating HEAD file2.txt | 1 + @@ -1405,7 +1441,7 @@ create mode 100644 file2.txt create mode 100644 file3.txt + git commit -m 'Add squashed copy of '\''defacto-squash-merged1'\''' -[master 1b63928] Add squashed copy of 'defacto-squash-merged1' +[master 1eb812f] Add squashed copy of 'defacto-squash-merged1' Author: Author One 2 files changed, 2 insertions(+) create mode 100644 file2.txt @@ -1413,9 +1449,9 @@ + git checkout -b not-defacto-squash-merged1 Switched to a new branch 'not-defacto-squash-merged1' + git revert --no-edit HEAD -[not-defacto-squash-merged1 a4050b4] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 976ff95] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Tue Jan 6 01:35:45 2026 -1200 + Date: Wed Jan 7 03:36:37 2026 +1400 2 files changed, 2 deletions(-) delete mode 100644 file2.txt delete mode 100644 file3.txt @@ -1429,11 +1465,11 @@ # git diff --exit-code --quiet # git diff --exit-code --quiet --cached # git merge-base master defacto-squash-merged1 -# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 71054c1a7a63dc533c668db640202cdace1ed04f 'defacto-squash-merged1^{tree}' -# git cherry master ded93d7e74db30d280319a60f2c9a630529f3292 +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 1c2167c0e7dd03ca21a2291888c1e102cfed2aed 'defacto-squash-merged1^{tree}' +# git cherry master bbeccfaa667bcbcd964cdc937f4333f00e632341 # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 71054c1a7a63dc533c668db640202cdace1ed04f 'defacto-squash-merged2^{tree}' -# git cherry master b3c601e801b78e9ec24feb92bdd24721b6e9e74b +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 1c2167c0e7dd03ca21a2291888c1e102cfed2aed 'defacto-squash-merged2^{tree}' +# git cherry master 400cd54f5aadab84c88c931c02b4ad74128a5cb7 ok test_refresh_gets_branches_back_in_sync (git_delete_merged_branches.tests.test_engine.RefreshTargetBranchesTest.test_refresh_gets_branches_back_in_sync) ... + export HOME= + HOME= @@ -1458,9 +1494,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp8rj4gu68/upstream/.git/ +Initialized empty Git repository in /tmp/tmprxtav57p/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) 68270a1] Dummy commit #1 +[master (root-commit) 569543a] Dummy commit #1 Author: Author One + git branch pull-works + git branch pull-trouble @@ -1469,7 +1505,7 @@ + echo line1 + git add collision.txt + git commit -m 'Add collision.txt' -[checkout-trouble 998beb6] Add collision.txt +[checkout-trouble d2f39c2] Add collision.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 collision.txt @@ -1491,7 +1527,7 @@ + git checkout pull-trouble Switched to branch 'pull-trouble' + git merge --ff checkout-trouble -Updating 68270a1..998beb6 +Updating 569543a..d2f39c2 Fast-forward collision.txt | 1 + 1 file changed, 1 insertion(+) @@ -1499,7 +1535,7 @@ + git checkout pull-works Switched to branch 'pull-works' + git commit --allow-empty -m 'Dummy commit #2' -[pull-works 498464d] Dummy commit #2 +[pull-works 716a8b7] Dummy commit #2 Author: Author One + cd .. + cd downstream @@ -1509,9 +1545,9 @@ # git rev-parse --symbolic-full-name HEAD # git branch # git remote update --prune upstream -From /tmp/tmp8rj4gu68/upstream - 68270a1..998beb6 pull-trouble -> upstream/pull-trouble - 68270a1..498464d pull-works -> upstream/pull-works +From /tmp/tmprxtav57p/upstream + 569543a..d2f39c2 pull-trouble -> upstream/pull-trouble + 569543a..716a8b7 pull-works -> upstream/pull-works # git cherry pull-works upstream/pull-works # git rev-parse --symbolic-full-name HEAD # git worktree list --porcelain @@ -1546,7 +1582,7 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpwa69kqdm/.git/ +Initialized empty Git repository in /tmp/tmpp7ynscu_/.git/ ok test (git_delete_merged_branches.tests.test_git.FindBranchNamesTest.test) ... ok test_find_branches_drops_head (git_delete_merged_branches.tests.test_git.FindBranchesTest.test_find_branches_drops_head) ... ok @@ -1569,7 +1605,7 @@ + GIT_COMMITTER_NAME='Committer Two' + mkdir upstream + pushd upstream -/tmp/tmpd1d2xt5b/upstream /tmp/tmpd1d2xt5b +/tmp/tmpk75g8nmj/upstream /tmp/tmpk75g8nmj + git init hint: Using 'master' as the name for the initial branch. This default branch name hint: is subject to change. To configure the initial branch name to use in all @@ -1581,20 +1617,20 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpd1d2xt5b/upstream/.git/ +Initialized empty Git repository in /tmp/tmpk75g8nmj/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 784228a] First commit +[master (root-commit) 8d6cb79] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmpd1d2xt5b +/tmp/tmpk75g8nmj + git clone upstream downstream Cloning into 'downstream'... done. # git branch --remote --list 'origin/*' # git push --delete --force-with-lease origin refs/heads/1.0.0 -To /tmp/tmpd1d2xt5b/upstream +To /tmp/tmpk75g8nmj/upstream - [deleted] 1.0.0 # git branch --remote --list 'origin/*' ok @@ -1604,7 +1640,7 @@ test_3_tick_tick_ (git_delete_merged_branches.tests.test_shell.ShellEscapingTest.test_3_tick_tick_) ... ok ---------------------------------------------------------------------- -Ran 30 tests in 0.754s +Ran 30 tests in 0.805s OK create-stamp debian/debhelper-build-stamp @@ -1846,12 +1882,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/1245529/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/1699798 and its subdirectories -I: Current time: Tue Jan 6 01:35:51 -12 2026 -I: pbuilder-time-stamp: 1767706551 +I: removing directory /srv/workspace/pbuilder/1245529 and its subdirectories +I: Current time: Wed Jan 7 03:36:43 +14 2026 +I: pbuilder-time-stamp: 1767706603