Diff of the two buildlogs: -- --- b1/build.log 2024-12-26 00:47:08.204921152 +0000 +++ b2/build.log 2024-12-26 00:48:10.390087835 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Wed Dec 25 12:46:15 -12 2024 -I: pbuilder-time-stamp: 1735173975 +I: Current time: Wed Jan 28 21:10:10 +14 2026 +I: pbuilder-time-stamp: 1769584210 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -22,52 +22,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/3323656/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/926389/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 28 07:10 /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/926389/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/926389/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='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='798db4d0ddfa4c61b8bcd42eab1727f6' - 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='3323656' - PS1='# ' - PS2='> ' + INVOCATION_ID=b0110730183e4f04bdb689fe9b66563d + 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=926389 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.c9YYtBmh/pbuilderrc_RT2y --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.c9YYtBmh/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.c9YYtBmh/pbuilderrc_dGNC --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.c9YYtBmh/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/3323656/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/926389/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -212,7 +244,7 @@ Get: 91 http://deb.debian.org/debian unstable/main arm64 python3-parameterized all 0.9.0-2 [20.2 kB] Get: 92 http://deb.debian.org/debian unstable/main arm64 python3-wcwidth all 0.2.13+dfsg1-1 [24.9 kB] Get: 93 http://deb.debian.org/debian unstable/main arm64 python3-prompt-toolkit all 3.0.48-1 [277 kB] -Fetched 47.9 MB in 0s (143 MB/s) +Fetched 47.9 MB in 0s (114 MB/s) Preconfiguring packages ... 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 ... 19974 files and directories currently installed.) @@ -528,8 +560,8 @@ Setting up tzdata (2024b-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Thu Dec 26 00:46:42 UTC 2024. -Universal Time is now: Thu Dec 26 00:46:42 UTC 2024. +Local time is now: Wed Jan 28 07:10:35 UTC 2026. +Universal Time is now: Wed Jan 28 07:10:35 UTC 2026. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -613,7 +645,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/926389/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/926389/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 @@ -796,11 +832,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp5z28n7on/.git/ +Initialized empty Git repository in /tmp/tmpv0y85bri/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) f082ada] Add file.txt with one line +[master (root-commit) cc38027] Add file.txt with one line Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file.txt @@ -809,7 +845,7 @@ Switched to a new branch 'merged2' + echo line2 + git commit -a -m 'Add line 2' -[merged2 a6a0002] Add line 2 +[merged2 82bb22f] Add line 2 Author: Author One 1 file changed, 1 insertion(+) + git checkout master @@ -822,7 +858,7 @@ Switched to a new branch 'not-merged1' + echo line3 + git commit -a -m 'Add line 3' -[not-merged1 bbac2a0] Add line 3 +[not-merged1 39ff340] Add line 3 Author: Author One 1 file changed, 1 insertion(+) # git branch @@ -849,11 +885,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp3qcq8qjb/.git/ +Initialized empty Git repository in /tmp/tmp8snwd9a9/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) 3a9b170] Add file1.txt +[master (root-commit) 0141cb7] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -862,14 +898,14 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged1 81a7fb2] Add file2.txt +[defacto-merged1 6ea3f9e] 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 1ffca4a] Add file3.txt +[defacto-merged1 e6541cb] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt @@ -878,14 +914,14 @@ + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged2 27b7388] Add file3.txt +[defacto-merged2 0add765] 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 90cf224] Add file2.txt +[defacto-merged2 3378749] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt @@ -894,19 +930,19 @@ + cp file1.txt file4.txt + git add file4.txt + git commit -m 'Add file4.txt' -[master 7ec0198] Add file4.txt +[master 9e7995e] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master 46e2940] Add file2.txt +[master 713208b] Add file2.txt Author: Author One - Date: Wed Dec 25 12:46:59 2024 -1200 + Date: Wed Jan 28 21:10:59 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master 24ad042] Add file3.txt +[master bf0dc94] Add file3.txt Author: Author One - Date: Wed Dec 25 12:46:59 2024 -1200 + Date: Wed Jan 28 21:10:59 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b not-defacto-merged1 defacto-merged1 @@ -914,7 +950,7 @@ + cp file1.txt file5.txt + git add file5.txt + git commit -m 'Add file5.txt' -[not-defacto-merged1 8766494] Add file5.txt +[not-defacto-merged1 a8e72ec] Add file5.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file5.txt @@ -946,11 +982,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp_x6_h8ni/.git/ +Initialized empty Git repository in /tmp/tmpqpy8ofba/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) 3a9b170] Add file1.txt +[master (root-commit) 0141cb7] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -959,35 +995,35 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-squash-merged1 81a7fb2] Add file2.txt +[defacto-squash-merged1 6ea3f9e] 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 1ffca4a] Add file3.txt +[defacto-squash-merged1 e6541cb] 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 c9db546] Revert "Add file3.txt" +[defacto-squash-merged2 4ceea58] Revert "Add file3.txt" Author: Author One - Date: Wed Dec 25 12:46:59 2024 -1200 + Date: Wed Jan 28 21:10:59 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 1d97803] Reapply "Add file3.txt" +[defacto-squash-merged2 b94f628] Reapply "Add file3.txt" Author: Author One - Date: Wed Dec 25 12:46:59 2024 -1200 + Date: Wed Jan 28 21:10:59 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 3a9b170..1ffca4a +Updating 0141cb7..e6541cb Fast-forward Squash commit -- not updating HEAD file2.txt | 1 + @@ -996,7 +1032,7 @@ create mode 100644 file2.txt create mode 100644 file3.txt + git commit -m 'Add squashed copy of '\''defacto-squash-merged1'\''' -[master d14d9bb] Add squashed copy of 'defacto-squash-merged1' +[master 431a284] Add squashed copy of 'defacto-squash-merged1' Author: Author One 2 files changed, 2 insertions(+) create mode 100644 file2.txt @@ -1004,9 +1040,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 40898d2] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 8357193] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Wed Dec 25 12:46:59 2024 -1200 + Date: Wed Jan 28 21:10:59 2026 +1400 2 files changed, 2 deletions(-) delete mode 100644 file2.txt delete mode 100644 file3.txt @@ -1020,11 +1056,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 3a9b170a6a10e42eb855e4572438b30594db5057 'defacto-squash-merged1^{tree}' -# git cherry master 7057bf4c50f5ce1fe19a15dd0b20f34a94d23280 +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 0141cb78b1f8cff88d7e4847088bac6d5e5054e4 'defacto-squash-merged1^{tree}' +# git cherry master 65f64cad0c31a9f1877dc5e70296ce79ad38b017 # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 3a9b170a6a10e42eb855e4572438b30594db5057 'defacto-squash-merged2^{tree}' -# git cherry master fb847a8f5dad5d27318766635d94372dcd9d688e +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 0141cb78b1f8cff88d7e4847088bac6d5e5054e4 'defacto-squash-merged2^{tree}' +# git cherry master 8553ffa906838fa3b3feeb3667afe7575ee57689 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= @@ -1049,9 +1085,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp_qfvsydw/upstream/.git/ +Initialized empty Git repository in /tmp/tmpb84rgvqj/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) a9dbd31] Dummy commit #1 +[master (root-commit) b7df590] Dummy commit #1 Author: Author One + git branch pull-works + git branch pull-trouble @@ -1060,7 +1096,7 @@ + echo line1 + git add collision.txt + git commit -m 'Add collision.txt' -[checkout-trouble 24f2784] Add collision.txt +[checkout-trouble f3b79ff] Add collision.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 collision.txt @@ -1082,7 +1118,7 @@ + git checkout pull-trouble Switched to branch 'pull-trouble' + git merge --ff checkout-trouble -Updating a9dbd31..24f2784 +Updating b7df590..f3b79ff Fast-forward collision.txt | 1 + 1 file changed, 1 insertion(+) @@ -1090,7 +1126,7 @@ + git checkout pull-works Switched to branch 'pull-works' + git commit --allow-empty -m 'Dummy commit #2' -[pull-works 05daaac] Dummy commit #2 +[pull-works fe8bbb3] Dummy commit #2 Author: Author One + cd .. + cd downstream @@ -1100,9 +1136,9 @@ # git rev-parse --symbolic-full-name HEAD # git branch # git remote update --prune upstream -From /tmp/tmp_qfvsydw/upstream - a9dbd31..24f2784 pull-trouble -> upstream/pull-trouble - a9dbd31..05daaac pull-works -> upstream/pull-works +From /tmp/tmpb84rgvqj/upstream + b7df590..f3b79ff pull-trouble -> upstream/pull-trouble + b7df590..fe8bbb3 pull-works -> upstream/pull-works # git cherry pull-works upstream/pull-works # git rev-parse --symbolic-full-name HEAD # git worktree list --porcelain @@ -1137,7 +1173,7 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpvar38yyz/.git/ +Initialized empty Git repository in /tmp/tmp5uu3n6bw/.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 @@ -1160,7 +1196,7 @@ + GIT_COMMITTER_NAME='Committer Two' + mkdir upstream + pushd upstream -/tmp/tmpay6b8i2h/upstream /tmp/tmpay6b8i2h +/tmp/tmp1bj7jevi/upstream /tmp/tmp1bj7jevi + 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 @@ -1172,20 +1208,20 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpay6b8i2h/upstream/.git/ +Initialized empty Git repository in /tmp/tmp1bj7jevi/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 6c37a78] First commit +[master (root-commit) c7cbd78] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmpay6b8i2h +/tmp/tmp1bj7jevi + 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/tmpay6b8i2h/upstream +To /tmp/tmp1bj7jevi/upstream - [deleted] 1.0.0 # git branch --remote --list 'origin/*' ok @@ -1195,7 +1231,7 @@ test_3_tick_tick_ (git_delete_merged_branches.tests.test_shell.ShellEscapingTest.test_3_tick_tick_) ... ok ---------------------------------------------------------------------- -Ran 30 tests in 0.786s +Ran 30 tests in 0.785s 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 @@ -1231,11 +1267,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp1yzyjmq1/.git/ +Initialized empty Git repository in /tmp/tmpaogmpjc5/.git/ + echo line1 + git add file.txt + git commit -m 'Add file.txt with one line' -[master (root-commit) e2aeae9] Add file.txt with one line +[master (root-commit) dfed8b8] Add file.txt with one line Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file.txt @@ -1244,7 +1280,7 @@ Switched to a new branch 'merged2' + echo line2 + git commit -a -m 'Add line 2' -[merged2 cd10076] Add line 2 +[merged2 256a312] Add line 2 Author: Author One 1 file changed, 1 insertion(+) + git checkout master @@ -1257,7 +1293,7 @@ Switched to a new branch 'not-merged1' + echo line3 + git commit -a -m 'Add line 3' -[not-merged1 4fc36e9] Add line 3 +[not-merged1 c29cadf] Add line 3 Author: Author One 1 file changed, 1 insertion(+) # git branch @@ -1284,11 +1320,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp70675ffw/.git/ +Initialized empty Git repository in /tmp/tmpjajm3yfb/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) aee2ee6] Add file1.txt +[master (root-commit) 87de748] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -1297,14 +1333,14 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-merged1 30ebd62] Add file2.txt +[defacto-merged1 2b774f3] 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 5f67b58] Add file3.txt +[defacto-merged1 cb6a80c] Add file3.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file3.txt @@ -1313,14 +1349,14 @@ + cp file1.txt file3.txt + git add file3.txt + git commit -m 'Add file3.txt' -[defacto-merged2 98ab646] Add file3.txt +[defacto-merged2 3662d85] 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 2e96140] Add file2.txt +[defacto-merged2 3dea6d9] Add file2.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file2.txt @@ -1329,19 +1365,19 @@ + cp file1.txt file4.txt + git add file4.txt + git commit -m 'Add file4.txt' -[master 6dabfe3] Add file4.txt +[master 6b9da52] Add file4.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file4.txt + git cherry-pick 'defacto-merged1^' defacto-merged1 -[master fe01835] Add file2.txt +[master 664c735] Add file2.txt Author: Author One - Date: Wed Dec 25 12:47:00 2024 -1200 + Date: Wed Jan 28 21:11:00 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file2.txt -[master 40b8b32] Add file3.txt +[master 99cf552] Add file3.txt Author: Author One - Date: Wed Dec 25 12:47:00 2024 -1200 + Date: Wed Jan 28 21:11:00 2026 +1400 1 file changed, 1 insertion(+) create mode 100644 file3.txt + git checkout -b not-defacto-merged1 defacto-merged1 @@ -1349,7 +1385,7 @@ + cp file1.txt file5.txt + git add file5.txt + git commit -m 'Add file5.txt' -[not-defacto-merged1 9f0311f] Add file5.txt +[not-defacto-merged1 8e4d692] Add file5.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file5.txt @@ -1381,11 +1417,11 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp48jf4pmx/.git/ +Initialized empty Git repository in /tmp/tmpilcu6g_6/.git/ + echo line1 + git add file1.txt + git commit -m 'Add file1.txt' -[master (root-commit) aee2ee6] Add file1.txt +[master (root-commit) 87de748] Add file1.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 file1.txt @@ -1394,35 +1430,35 @@ + cp file1.txt file2.txt + git add file2.txt + git commit -m 'Add file2.txt' -[defacto-squash-merged1 30ebd62] Add file2.txt +[defacto-squash-merged1 2b774f3] 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 5f67b58] Add file3.txt +[defacto-squash-merged1 cb6a80c] 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 de3ec4d] Revert "Add file3.txt" +[defacto-squash-merged2 3fc76bc] Revert "Add file3.txt" Author: Author One - Date: Wed Dec 25 12:47:00 2024 -1200 + Date: Wed Jan 28 21:11:00 2026 +1400 1 file changed, 1 deletion(-) delete mode 100644 file3.txt + git revert --no-edit HEAD -[defacto-squash-merged2 b8629d6] Reapply "Add file3.txt" +[defacto-squash-merged2 2d4941f] Reapply "Add file3.txt" Author: Author One - Date: Wed Dec 25 12:47:00 2024 -1200 + Date: Wed Jan 28 21:11:00 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 aee2ee6..5f67b58 +Updating 87de748..cb6a80c Fast-forward Squash commit -- not updating HEAD file2.txt | 1 + @@ -1431,7 +1467,7 @@ create mode 100644 file2.txt create mode 100644 file3.txt + git commit -m 'Add squashed copy of '\''defacto-squash-merged1'\''' -[master d42ef03] Add squashed copy of 'defacto-squash-merged1' +[master d87c904] Add squashed copy of 'defacto-squash-merged1' Author: Author One 2 files changed, 2 insertions(+) create mode 100644 file2.txt @@ -1439,9 +1475,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 18d4e32] Revert "Add squashed copy of 'defacto-squash-merged1'" +[not-defacto-squash-merged1 66fb9e8] Revert "Add squashed copy of 'defacto-squash-merged1'" Author: Author One - Date: Wed Dec 25 12:47:00 2024 -1200 + Date: Wed Jan 28 21:11:00 2026 +1400 2 files changed, 2 deletions(-) delete mode 100644 file2.txt delete mode 100644 file3.txt @@ -1455,11 +1491,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 aee2ee6d6f2ba59a54d576da27406a97198a41e3 'defacto-squash-merged1^{tree}' -# git cherry master d1fc4280ebac8a5168b1e9c5fec69bdf306ff646 +# git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p 87de7488cf983eec865d28a9ddbe1d82e29308d4 'defacto-squash-merged1^{tree}' +# git cherry master 0f25aa1fc7c983bcb58cf049ceaf263c60faf56f # git merge-base master defacto-squash-merged2 -# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p aee2ee6d6f2ba59a54d576da27406a97198a41e3 'defacto-squash-merged2^{tree}' -# git cherry master c5436c93ea31baa1bec32f704e7a4f094ab1e53f +# git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p 87de7488cf983eec865d28a9ddbe1d82e29308d4 'defacto-squash-merged2^{tree}' +# git cherry master 7b9f39429dd8bb7e9a75f378bd6eca1c75066d31 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= @@ -1484,9 +1520,9 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmpsbi14mey/upstream/.git/ +Initialized empty Git repository in /tmp/tmpi9dvojt3/upstream/.git/ + git commit --allow-empty -m 'Dummy commit #1' -[master (root-commit) 2d295fa] Dummy commit #1 +[master (root-commit) 145c83f] Dummy commit #1 Author: Author One + git branch pull-works + git branch pull-trouble @@ -1495,7 +1531,7 @@ + echo line1 + git add collision.txt + git commit -m 'Add collision.txt' -[checkout-trouble 6df77b8] Add collision.txt +[checkout-trouble a2cbab1] Add collision.txt Author: Author One 1 file changed, 1 insertion(+) create mode 100644 collision.txt @@ -1517,7 +1553,7 @@ + git checkout pull-trouble Switched to branch 'pull-trouble' + git merge --ff checkout-trouble -Updating 2d295fa..6df77b8 +Updating 145c83f..a2cbab1 Fast-forward collision.txt | 1 + 1 file changed, 1 insertion(+) @@ -1525,7 +1561,7 @@ + git checkout pull-works Switched to branch 'pull-works' + git commit --allow-empty -m 'Dummy commit #2' -[pull-works 6aae16d] Dummy commit #2 +[pull-works 05e1a0e] Dummy commit #2 Author: Author One + cd .. + cd downstream @@ -1535,9 +1571,9 @@ # git rev-parse --symbolic-full-name HEAD # git branch # git remote update --prune upstream -From /tmp/tmpsbi14mey/upstream - 2d295fa..6df77b8 pull-trouble -> upstream/pull-trouble - 2d295fa..6aae16d pull-works -> upstream/pull-works +From /tmp/tmpi9dvojt3/upstream + 145c83f..a2cbab1 pull-trouble -> upstream/pull-trouble + 145c83f..05e1a0e pull-works -> upstream/pull-works # git cherry pull-works upstream/pull-works # git rev-parse --symbolic-full-name HEAD # git worktree list --porcelain @@ -1572,7 +1608,7 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp976vk7nu/.git/ +Initialized empty Git repository in /tmp/tmp82ralcqq/.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 @@ -1595,7 +1631,7 @@ + GIT_COMMITTER_NAME='Committer Two' + mkdir upstream + pushd upstream -/tmp/tmp0v62st4u/upstream /tmp/tmp0v62st4u +/tmp/tmp6ga9v0np/upstream /tmp/tmp6ga9v0np + 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 @@ -1607,20 +1643,20 @@ hint: 'development'. The just-created branch can be renamed via this command: hint: hint: git branch -m -Initialized empty Git repository in /tmp/tmp0v62st4u/upstream/.git/ +Initialized empty Git repository in /tmp/tmp6ga9v0np/upstream/.git/ + git commit --allow-empty -m 'First commit' -[master (root-commit) 53ecfbd] First commit +[master (root-commit) 378d44d] First commit Author: Author One + git tag -m '' 1.0.0 + git branch 1.0.0 + popd -/tmp/tmp0v62st4u +/tmp/tmp6ga9v0np + 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/tmp0v62st4u/upstream +To /tmp/tmp6ga9v0np/upstream - [deleted] 1.0.0 # git branch --remote --list 'origin/*' ok @@ -1630,7 +1666,7 @@ test_3_tick_tick_ (git_delete_merged_branches.tests.test_shell.ShellEscapingTest.test_3_tick_tick_) ... ok ---------------------------------------------------------------------- -Ran 30 tests in 0.807s +Ran 30 tests in 0.780s OK create-stamp debian/debhelper-build-stamp @@ -1872,12 +1908,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/926389/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/926389/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/3323656 and its subdirectories -I: Current time: Wed Dec 25 12:47:07 -12 2024 -I: pbuilder-time-stamp: 1735174027 +I: removing directory /srv/workspace/pbuilder/926389 and its subdirectories +I: Current time: Wed Jan 28 21:11:07 +14 2026 +I: pbuilder-time-stamp: 1769584267