Diff of the two buildlogs: -- --- b1/build.log 2024-12-28 05:20:37.616883423 +0000 +++ b2/build.log 2024-12-28 05:22:57.758484711 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Fri Dec 27 17:19:26 -12 2024 -I: pbuilder-time-stamp: 1735363166 +I: Current time: Sat Jan 31 01:43:39 +14 2026 +I: pbuilder-time-stamp: 1769773419 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -26,52 +26,84 @@ dpkg-source: info: unpacking git-delete-merged-branches_7.4.2-1.debian.tar.xz I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/295473/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/3102416/tmp/hooks/D01_modify_environment starting +debug: Running on codethink03-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 30 11:43 /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/3102416/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/3102416/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]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu") + BASH_VERSION='5.2.37(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='trixie' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='b3733d9d3d7741ed81e88052c13cfc0a' - 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='295473' - PS1='# ' - PS2='> ' + INVOCATION_ID=d84a86dee3484d5983942d919d727926 + 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=3102416 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.HbIZTmx1/pbuilderrc_VGu4 --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.HbIZTmx1/b1 --logfile b1/build.log git-delete-merged-branches_7.4.2-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.HbIZTmx1/pbuilderrc_PHnd --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.HbIZTmx1/b2 --logfile b2/build.log git-delete-merged-branches_7.4.2-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 codethink04-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 14:40 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/295473/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/3102416/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 trixie/main arm64 python3-parameterized all 0.9.0-2 [20.2 kB] Get: 86 http://deb.debian.org/debian trixie/main arm64 python3-wcwidth all 0.2.13+dfsg1-1 [24.9 kB] Get: 87 http://deb.debian.org/debian trixie/main arm64 python3-prompt-toolkit all 3.0.48-1 [277 kB] -Fetched 45.5 MB in 0s (145 MB/s) +Fetched 45.5 MB in 1s (49.9 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 ... 20081 files and directories currently installed.) @@ -509,8 +541,8 @@ Setting up tzdata (2024b-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Sat Dec 28 05:20:04 UTC 2024. -Universal Time is now: Sat Dec 28 05:20:04 UTC 2024. +Local time is now: Fri Jan 30 11:44:35 UTC 2026. +Universal Time is now: Fri Jan 30 11:44:35 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.2/ && 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.2-1_source.changes +I: user script /srv/workspace/pbuilder/3102416/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/3102416/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.2/ && 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.2-1_source.changes dpkg-buildpackage: info: source package git-delete-merged-branches dpkg-buildpackage: info: source version 7.4.2-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/tmprsbz4j_o/.git/ +Initialized empty Git repository in /tmp/tmp3vtp2eeg/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) fa7a17f] Add file.txt with one line +[master (root-commit) 781533c] 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 6deb069] Add line 2 +[merged2 9293f1a] 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 f7f8e50] Add line 3 +[not-merged1 54d70f8] 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/tmpnlzu0152/.git/ +Initialized empty Git repository in /tmp/tmpzk5ecwt3/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) 99b790f] Add file1.txt +[master (root-commit) 0c531d8] 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 c826d97] Add file2.txt +[defacto-merged1 8ddd1bf] 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 79e306a] Add file3.txt +[defacto-merged1 b380905] 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 09c2d64] Add file3.txt +[defacto-merged2 36ebafd] 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 4dbaeb0] Add file2.txt +[defacto-merged2 33a2470] 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 982f35a] Add file4.txt +[master e59b97f] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master 573b3ab] Add file2.txt +[master 4165826] Add file2.txt Author: Author One - Date: Fri Dec 27 17:20:25 2024 -1200 + Date: Sat Jan 31 01:45:33 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master 9fec187] Add file3.txt +[master d106015] Add file3.txt Author: Author One - Date: Fri Dec 27 17:20:25 2024 -1200 + Date: Sat Jan 31 01:45:34 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 7ede487] Add file5.txt +[not-defacto-merged1 5c52883] 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/tmpuibbtpot/.git/ +Initialized empty Git repository in /tmp/tmpaho5gni1/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) b43b947] Add file1.txt +[master (root-commit) 52abe72] 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 0b0f833] Add file2.txt +[defacto-squash-merged1 d503e7b] 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 78429f5] Add file3.txt +[defacto-squash-merged1 de2763c] 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 6c29529] Revert "Add file3.txt" +[defacto-squash-merged2 fff49f3] Revert "Add file3.txt" Author: Author One - Date: Fri Dec 27 17:20:26 2024 -1200 + Date: Sat Jan 31 01:45:34 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 a5ea185] Reapply "Add file3.txt" +[defacto-squash-merged2 e41b94c] Reapply "Add file3.txt" Author: Author One - Date: Fri Dec 27 17:20:26 2024 -1200 + Date: Sat Jan 31 01:45:34 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 b43b947..78429f5 +Updating 52abe72..de2763c 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 4bd8d84] Add squashed copy of 'defacto-squash-merged1' +[master b25408a] 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 14bd088] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 562c554] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Fri Dec 27 17:20:26 2024 -1200 + Date: Sat Jan 31 01:45:35 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 b43b9470bb846b47f77adbf937e288b494c95aa2 'defacto-squash-merged1^{tree}' -# git cherry master 838cc7442da23828c61e30d7b3a71c8f6d3e14b3 +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 52abe728f3d60c81ceb007ce99b7e5534d1e338d 'defacto-squash-merged1^{tree}' +# git cherry master 7034028304089235f2dc6c6ec96520ebd49b3991 # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p b43b9470bb846b47f77adbf937e288b494c95aa2 'defacto-squash-merged2^{tree}' -# git cherry master 0c09283512921ebbb20cf3a2cb963370c88bbab3 +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 52abe728f3d60c81ceb007ce99b7e5534d1e338d 'defacto-squash-merged2^{tree}' +# git cherry master cf6285861a8101f579dee3e237b4a8b1d54c2a39 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/tmpfzbl0suh/upstream/.git/ +Initialized empty Git repository in /tmp/tmpky36lhov/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) 9546620] Dummy commit #1 +[master (root-commit) 2e6e506] 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 d3c4684] Add collision.txt +[checkout-trouble a496737] 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 9546620..d3c4684 +Updating 2e6e506..a496737 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 d6c21d2] Dummy commit #2 +[pull-works 9e3ad6c] 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/tmpfzbl0suh/upstream - 9546620..d3c4684 pull-trouble -> upstream/pull-trouble - 9546620..d6c21d2 pull-works -> upstream/pull-works +From /tmp/tmpky36lhov/upstream + 2e6e506..a496737 pull-trouble -> upstream/pull-trouble + 2e6e506..9e3ad6c 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/tmp15s9q2pk/.git/ +Initialized empty Git repository in /tmp/tmpjb_rhlsq/.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/tmptq47gbt7/upstream /tmp/tmptq47gbt7 +/tmp/tmpa5x8ihrz/upstream /tmp/tmpa5x8ihrz + 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/tmptq47gbt7/upstream/.git/ +Initialized empty Git repository in /tmp/tmpa5x8ihrz/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 3cd2cab] First commit +[master (root-commit) fa39ff5] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmptq47gbt7 +/tmp/tmpa5x8ihrz + 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/tmptq47gbt7/upstream +To /tmp/tmpa5x8ihrz/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 2.405s +Ran 30 tests in 4.151s OK I: pybuild base:311: cd /build/reproducible-path/git-delete-merged-branches-7.4.2/.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/tmpsc1jpntq/.git/ +Initialized empty Git repository in /tmp/tmpov1y5tn4/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) e6f2fb1] Add file.txt with one line +[master (root-commit) a0754c1] 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 3166a2a] Add line 2 +[merged2 9a4476c] 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 a48bb15] Add line 3 +[not-merged1 cb29848] 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/tmp9q7e27ie/.git/ +Initialized empty Git repository in /tmp/tmp72xmq4kf/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) c0dbdf0] Add file1.txt +[master (root-commit) 0b87fe8] 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 dfcb2ff] Add file2.txt +[defacto-merged1 13a2022] 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 0c5d508] Add file3.txt +[defacto-merged1 7020d5b] 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 4bf6b17] Add file3.txt +[defacto-merged2 de955b0] 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 83b7f07] Add file2.txt +[defacto-merged2 5f2c272] 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 1cf9120] Add file4.txt +[master f28f2aa] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master 18ecffb] Add file2.txt +[master 1bfeb05] Add file2.txt Author: Author One - Date: Fri Dec 27 17:20:28 2024 -1200 + Date: Sat Jan 31 01:45:38 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master e8530bc] Add file3.txt +[master a4f67d0] Add file3.txt Author: Author One - Date: Fri Dec 27 17:20:28 2024 -1200 + Date: Sat Jan 31 01:45:38 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 b5318bc] Add file5.txt +[not-defacto-merged1 10dd170] 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/tmp0me81v6a/.git/ +Initialized empty Git repository in /tmp/tmpvvmeb0i5/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) c678fec] Add file1.txt +[master (root-commit) b8fa29f] 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 d36326a] Add file2.txt +[defacto-squash-merged1 5d4c462] 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 78a56db] Add file3.txt +[defacto-squash-merged1 218d557] 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 f43f458] Revert "Add file3.txt" +[defacto-squash-merged2 6df45cb] Revert "Add file3.txt" Author: Author One - Date: Fri Dec 27 17:20:29 2024 -1200 + Date: Sat Jan 31 01:45:39 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 9fd2d59] Reapply "Add file3.txt" +[defacto-squash-merged2 05597d8] Reapply "Add file3.txt" Author: Author One - Date: Fri Dec 27 17:20:29 2024 -1200 + Date: Sat Jan 31 01:45:39 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 c678fec..78a56db +Updating b8fa29f..218d557 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 bf4d1f8] Add squashed copy of 'defacto-squash-merged1' +[master 1096355] 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 88d1d7a] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 b5da66a] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Fri Dec 27 17:20:29 2024 -1200 + Date: Sat Jan 31 01:45:40 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 c678fec13e25cb48c044d01a09cbfafdc4a2abbf 'defacto-squash-merged1^{tree}' -# git cherry master 908e42d0c04bff422ad093eb37532d442530f888 +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p b8fa29fc3957777f66e091e686b59cdb80c04815 'defacto-squash-merged1^{tree}' +# git cherry master 6d4e3308f9108706762c33d95a6da0ca24465ba8 # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p c678fec13e25cb48c044d01a09cbfafdc4a2abbf 'defacto-squash-merged2^{tree}' -# git cherry master 6edfd029d138711de35d0a7a398c3378b6f535ab +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p b8fa29fc3957777f66e091e686b59cdb80c04815 'defacto-squash-merged2^{tree}' +# git cherry master c26399c0d55ed1a8d877d3f02effa44fae4750e3 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/tmp1ukeaxzb/upstream/.git/ +Initialized empty Git repository in /tmp/tmpl3ni08cr/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) 5011aed] Dummy commit #1 +[master (root-commit) a27d09d] 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 77fc927] Add collision.txt +[checkout-trouble f730d5a] 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 5011aed..77fc927 +Updating a27d09d..f730d5a 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 7ed253c] Dummy commit #2 +[pull-works 1d6fcde] 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/tmp1ukeaxzb/upstream - 5011aed..77fc927 pull-trouble -> upstream/pull-trouble - 5011aed..7ed253c pull-works -> upstream/pull-works +From /tmp/tmpl3ni08cr/upstream + a27d09d..f730d5a pull-trouble -> upstream/pull-trouble + a27d09d..1d6fcde 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/tmpc4l9mlfd/.git/ +Initialized empty Git repository in /tmp/tmpfbwoyao1/.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/tmpm6a4odx_/upstream /tmp/tmpm6a4odx_ +/tmp/tmp8p14ja7c/upstream /tmp/tmp8p14ja7c + 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/tmpm6a4odx_/upstream/.git/ +Initialized empty Git repository in /tmp/tmp8p14ja7c/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 7a29355] First commit +[master (root-commit) a939d6a] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmpm6a4odx_ +/tmp/tmp8p14ja7c + 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/tmpm6a4odx_/upstream +To /tmp/tmp8p14ja7c/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 2.270s +Ran 30 tests in 3.837s OK create-stamp debian/debhelper-build-stamp @@ -1836,8 +1872,8 @@ dh_gencontrol -O--buildsystem=pybuild dh_md5sums -O--buildsystem=pybuild dh_builddeb -O--buildsystem=pybuild -dpkg-deb: building package 'python3-git-delete-merged-branches' in '../python3-git-delete-merged-branches_7.4.2-1_all.deb'. dpkg-deb: building package 'git-delete-merged-branches' in '../git-delete-merged-branches_7.4.2-1_all.deb'. +dpkg-deb: building package 'python3-git-delete-merged-branches' in '../python3-git-delete-merged-branches_7.4.2-1_all.deb'. dpkg-genbuildinfo --build=binary -O../git-delete-merged-branches_7.4.2-1_arm64.buildinfo dpkg-genchanges --build=binary -O../git-delete-merged-branches_7.4.2-1_arm64.changes dpkg-genchanges: info: binary-only upload (no source code included) @@ -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/3102416/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/3102416/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/295473 and its subdirectories -I: Current time: Fri Dec 27 17:20:36 -12 2024 -I: pbuilder-time-stamp: 1735363236 +I: removing directory /srv/workspace/pbuilder/3102416 and its subdirectories +I: Current time: Sat Jan 31 01:45:55 +14 2026 +I: pbuilder-time-stamp: 1769773555