0s autopkgtest [22:42:17]: starting date and time: 2024-03-21 22:42:17+0000
  0s autopkgtest [22:42:17]: git checkout: 4a1cd702 l/adt_testbed: don't blame the testbed for unsolvable build deps
  0s autopkgtest [22:42:17]: host juju-7f2275-prod-proposed-migration-environment-2; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.kk3nzapf/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --setup-commands /home/ubuntu/autopkgtest/setup-commands/setup-testbed --apt-pocket=proposed=src:git,src:curl,src:gnutls28,src:libpsl,src:nettle --apt-upgrade git-delete-merged-branches --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 '--env=ADT_TEST_TRIGGERS=git/1:2.43.0-1ubuntu5 curl/8.5.0-2ubuntu7 gnutls28/3.8.3-1.1ubuntu2 libpsl/0.21.2-1.1 nettle/3.9.1-2.2' -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-2@bos01-s390x-4.secgroup --name adt-noble-s390x-git-delete-merged-branches-20240321-224217-juju-7f2275-prod-proposed-migration-environment-2 --image adt/ubuntu-noble-s390x-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-2 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com'"'"'' --mirror=http://us.ports.ubuntu.com/ubuntu-ports/
159s autopkgtest [22:44:56]: testbed dpkg architecture: s390x
159s autopkgtest [22:44:56]: testbed apt version: 2.7.12
159s autopkgtest [22:44:56]: @@@@@@@@@@@@@@@@@@@@ test bed setup
159s Get:1 http://ftpmaster.internal/ubuntu noble-proposed InRelease [117 kB]
160s Get:2 http://ftpmaster.internal/ubuntu noble-proposed/universe Sources [3774 kB]
161s Get:3 http://ftpmaster.internal/ubuntu noble-proposed/restricted Sources [6540 B]
161s Get:4 http://ftpmaster.internal/ubuntu noble-proposed/main Sources [496 kB]
161s Get:5 http://ftpmaster.internal/ubuntu noble-proposed/multiverse Sources [53.9 kB]
161s Get:6 http://ftpmaster.internal/ubuntu noble-proposed/main s390x Packages [671 kB]
161s Get:7 http://ftpmaster.internal/ubuntu noble-proposed/main s390x c-n-f Metadata [3032 B]
161s Get:8 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x Packages [1372 B]
161s Get:9 http://ftpmaster.internal/ubuntu noble-proposed/restricted s390x c-n-f Metadata [116 B]
161s Get:10 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x Packages [3994 kB]
162s Get:11 http://ftpmaster.internal/ubuntu noble-proposed/universe s390x c-n-f Metadata [7292 B]
162s Get:12 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x Packages [45.1 kB]
162s Get:13 http://ftpmaster.internal/ubuntu noble-proposed/multiverse s390x c-n-f Metadata [116 B]
163s Fetched 9169 kB in 3s (2753 kB/s)
164s Reading package lists...
167s Reading package lists...
167s Building dependency tree...
167s Reading state information...
167s Calculating upgrade...
167s The following packages have been kept back:
167s   curl
167s The following packages will be upgraded:
167s   cloud-init debianutils python3-markupsafe
167s 3 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
167s Need to get 700 kB of archives.
167s After this operation, 11.3 kB disk space will be freed.
167s Get:1 http://ftpmaster.internal/ubuntu noble/main s390x debianutils s390x 5.17 [90.1 kB]
168s Get:2 http://ftpmaster.internal/ubuntu noble/main s390x python3-markupsafe s390x 2.1.5-1build1 [12.8 kB]
168s Get:3 http://ftpmaster.internal/ubuntu noble/main s390x cloud-init all 24.1.2-0ubuntu1 [597 kB]
168s Preconfiguring packages ...
168s Fetched 700 kB in 0s (1438 kB/s)
168s (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 ... 51778 files and directories currently installed.)
168s Preparing to unpack .../debianutils_5.17_s390x.deb ...
168s Unpacking debianutils (5.17) over (5.16) ...
168s Setting up debianutils (5.17) ...
169s (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 ... 51778 files and directories currently installed.)
170s Preparing to unpack .../python3-markupsafe_2.1.5-1build1_s390x.deb ...
170s Unpacking python3-markupsafe (2.1.5-1build1) over (2.1.5-1) ...
170s Preparing to unpack .../cloud-init_24.1.2-0ubuntu1_all.deb ...
170s Unpacking cloud-init (24.1.2-0ubuntu1) over (24.1.1-0ubuntu1) ...
170s Setting up cloud-init (24.1.2-0ubuntu1) ...
171s Setting up python3-markupsafe (2.1.5-1build1) ...
171s Processing triggers for man-db (2.12.0-3) ...
172s Processing triggers for rsyslog (8.2312.0-3ubuntu3) ...
172s Reading package lists...
173s Building dependency tree...
173s Reading state information...
173s 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
173s Unknown architecture, assuming PC-style ttyS0
173s sh: Attempting to set up Debian/Ubuntu apt sources automatically
173s sh: Distribution appears to be Ubuntu
175s Reading package lists...
175s Building dependency tree...
175s Reading state information...
175s eatmydata is already the newest version (131-1).
175s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
175s Reading package lists...
175s Building dependency tree...
175s Reading state information...
175s dbus is already the newest version (1.14.10-4ubuntu1).
175s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
175s Reading package lists...
176s Building dependency tree...
176s Reading state information...
176s rng-tools-debian is already the newest version (2.4).
176s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
176s Reading package lists...
176s Building dependency tree...
176s Reading state information...
176s The following packages will be REMOVED:
176s   cloud-init* python3-configobj* python3-debconf*
177s 0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded.
177s After this operation, 3256 kB disk space will be freed.
177s (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 ... 51777 files and directories currently installed.)
177s Removing cloud-init (24.1.2-0ubuntu1) ...
177s Removing python3-configobj (5.0.8-3) ...
177s Removing python3-debconf (1.5.86) ...
177s Processing triggers for man-db (2.12.0-3) ...
178s (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 ... 51388 files and directories currently installed.)
178s Purging configuration files for cloud-init (24.1.2-0ubuntu1) ...
178s dpkg: warning: while removing cloud-init, directory '/etc/cloud/cloud.cfg.d' not empty so not removed
178s Processing triggers for rsyslog (8.2312.0-3ubuntu3) ...
178s invoke-rc.d: policy-rc.d denied execution of try-restart.
179s Reading package lists...
179s Building dependency tree...
179s Reading state information...
179s linux-generic is already the newest version (6.8.0-11.11+1).
179s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
180s Hit:1 http://ftpmaster.internal/ubuntu noble InRelease
180s Hit:2 http://ftpmaster.internal/ubuntu noble-updates InRelease
180s Hit:3 http://ftpmaster.internal/ubuntu noble-security InRelease
182s Reading package lists...
182s Reading package lists...
182s Building dependency tree...
182s Reading state information...
183s Calculating upgrade...
183s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
183s Reading package lists...
183s Building dependency tree...
183s Reading state information...
183s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
184s autopkgtest [22:45:21]: rebooting testbed after setup commands that affected boot
219s autopkgtest [22:45:56]: testbed running kernel: Linux 6.8.0-11-generic #11-Ubuntu SMP Tue Feb 13 23:45:46 UTC 2024
221s autopkgtest [22:45:58]: @@@@@@@@@@@@@@@@@@@@ apt-source git-delete-merged-branches
224s Get:1 http://ftpmaster.internal/ubuntu noble/universe git-delete-merged-branches 7.4.0-1 (dsc) [2503 B]
224s Get:2 http://ftpmaster.internal/ubuntu noble/universe git-delete-merged-branches 7.4.0-1 (tar) [37.0 kB]
224s Get:3 http://ftpmaster.internal/ubuntu noble/universe git-delete-merged-branches 7.4.0-1 (diff) [2876 B]
224s gpgv: Signature made Fri Dec 23 23:30:34 2022 UTC
224s gpgv:                using RSA key BA9821C12E07894FB2E4AD0091DC4A779EC5C910
224s gpgv:                issuer "dtorrance@debian.org"
224s gpgv: Can't check signature: No public key
224s dpkg-source: warning: cannot verify inline signature for ./git-delete-merged-branches_7.4.0-1.dsc: no acceptable signature found
224s autopkgtest [22:46:01]: testing package git-delete-merged-branches version 7.4.0-1
224s autopkgtest [22:46:01]: build not needed
224s autopkgtest [22:46:01]: test command1: preparing testbed
226s Reading package lists...
226s Building dependency tree...
226s Reading state information...
226s Starting pkgProblemResolver with broken count: 0
226s Starting 2 pkgProblemResolver with broken count: 0
226s Done
226s The following additional packages will be installed:
226s   git git-man liberror-perl python3-colorama
226s   python3-git-delete-merged-branches python3-parameterized
226s   python3-prompt-toolkit python3-wcwidth
226s Suggested packages:
226s   git-daemon-run | git-daemon-sysvinit git-doc git-email git-gui gitk gitweb
226s   git-cvs git-mediawiki git-svn
226s The following NEW packages will be installed:
226s   autopkgtest-satdep git git-man liberror-perl python3-colorama
226s   python3-git-delete-merged-branches python3-parameterized
226s   python3-prompt-toolkit python3-wcwidth
226s 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
226s Need to get 5315 kB/5316 kB of archives.
226s After this operation, 27.9 MB of additional disk space will be used.
226s Get:1 /tmp/autopkgtest.tpMnFX/1-autopkgtest-satdep.deb autopkgtest-satdep s390x 0 [740 B]
227s Get:2 http://ftpmaster.internal/ubuntu noble/main s390x liberror-perl all 0.17029-2 [25.6 kB]
227s Get:3 http://ftpmaster.internal/ubuntu noble/main s390x git-man all 1:2.43.0-1ubuntu1 [1100 kB]
227s Get:4 http://ftpmaster.internal/ubuntu noble/main s390x git s390x 1:2.43.0-1ubuntu1 [3837 kB]
228s Get:5 http://ftpmaster.internal/ubuntu noble/main s390x python3-colorama all 0.4.6-4 [32.1 kB]
228s Get:6 http://ftpmaster.internal/ubuntu noble/main s390x python3-wcwidth all 0.2.5+dfsg1-1.1ubuntu1 [22.5 kB]
228s Get:7 http://ftpmaster.internal/ubuntu noble/universe s390x python3-prompt-toolkit all 3.0.43-1 [256 kB]
228s Get:8 http://ftpmaster.internal/ubuntu noble/universe s390x python3-git-delete-merged-branches all 7.4.0-1 [22.8 kB]
228s Get:9 http://ftpmaster.internal/ubuntu noble/universe s390x python3-parameterized all 0.8.1-6 [19.5 kB]
228s Fetched 5315 kB in 2s (3471 kB/s)
228s Selecting previously unselected package liberror-perl.
228s (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 ... 51331 files and directories currently installed.)
228s Preparing to unpack .../0-liberror-perl_0.17029-2_all.deb ...
228s Unpacking liberror-perl (0.17029-2) ...
228s Selecting previously unselected package git-man.
228s Preparing to unpack .../1-git-man_1%3a2.43.0-1ubuntu1_all.deb ...
228s Unpacking git-man (1:2.43.0-1ubuntu1) ...
228s Selecting previously unselected package git.
228s Preparing to unpack .../2-git_1%3a2.43.0-1ubuntu1_s390x.deb ...
228s Unpacking git (1:2.43.0-1ubuntu1) ...
229s Selecting previously unselected package python3-colorama.
229s Preparing to unpack .../3-python3-colorama_0.4.6-4_all.deb ...
229s Unpacking python3-colorama (0.4.6-4) ...
229s Selecting previously unselected package python3-wcwidth.
229s Preparing to unpack .../4-python3-wcwidth_0.2.5+dfsg1-1.1ubuntu1_all.deb ...
229s Unpacking python3-wcwidth (0.2.5+dfsg1-1.1ubuntu1) ...
229s Selecting previously unselected package python3-prompt-toolkit.
229s Preparing to unpack .../5-python3-prompt-toolkit_3.0.43-1_all.deb ...
229s Unpacking python3-prompt-toolkit (3.0.43-1) ...
229s Selecting previously unselected package python3-git-delete-merged-branches.
229s Preparing to unpack .../6-python3-git-delete-merged-branches_7.4.0-1_all.deb ...
229s Unpacking python3-git-delete-merged-branches (7.4.0-1) ...
229s Selecting previously unselected package python3-parameterized.
229s Preparing to unpack .../7-python3-parameterized_0.8.1-6_all.deb ...
229s Unpacking python3-parameterized (0.8.1-6) ...
229s Selecting previously unselected package autopkgtest-satdep.
229s Preparing to unpack .../8-1-autopkgtest-satdep.deb ...
229s Unpacking autopkgtest-satdep (0) ...
229s Setting up python3-parameterized (0.8.1-6) ...
229s Setting up python3-colorama (0.4.6-4) ...
229s Setting up liberror-perl (0.17029-2) ...
229s Setting up python3-wcwidth (0.2.5+dfsg1-1.1ubuntu1) ...
229s Setting up git-man (1:2.43.0-1ubuntu1) ...
229s Setting up python3-prompt-toolkit (3.0.43-1) ...
230s Setting up git (1:2.43.0-1ubuntu1) ...
230s Setting up python3-git-delete-merged-branches (7.4.0-1) ...
230s Setting up autopkgtest-satdep (0) ...
230s Processing triggers for man-db (2.12.0-3) ...
233s (Reading database ... 52684 files and directories currently installed.)
233s Removing autopkgtest-satdep (0) ...
233s autopkgtest [22:46:10]: test command1: cp debian/tests/test.py $AUTOPKGTEST_TMP && cd $AUTOPKGTEST_TMP && python3 test.py
233s autopkgtest [22:46:10]: test command1: [-----------------------
234s /tmp/autopkgtest.tpMnFX/autopkgtest_tmp/test.py:8: SyntaxWarning: invalid escape sequence '\.'
234s   for match in [re.search("(test_.*)\.py", filename)
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s Initialized empty Git repository in /tmp/tmpuaugm_yv/.git/
234s ..........+ export HOME=
234s + HOME=
234s + export GIT_AUTHOR_EMAIL=author1@localhost
234s + GIT_AUTHOR_EMAIL=author1@localhost
234s + export 'GIT_AUTHOR_NAME=Author One'
234s + GIT_AUTHOR_NAME='Author One'
234s + export GIT_COMMITTER_EMAIL=committer2@localhost
234s + GIT_COMMITTER_EMAIL=committer2@localhost
234s + export 'GIT_COMMITTER_NAME=Committer Two'
234s + GIT_COMMITTER_NAME='Committer Two'
234s + mkdir upstream
234s + pushd upstream
234s /tmp/tmp18gsv6fk/upstream /tmp/tmp18gsv6fk
234s + git init
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s + git commit --allow-empty -m 'First commit'
234s + git tag -m '' 1.0.0
234s + git branch 1.0.0
234s + popd
234s + git clone upstream downstream
234s Cloning into 'downstream'...
234s done.
234s # git branch --remote --list 'origin/*'
234s # git push --delete --force-with-lease origin refs/heads/1.0.0
234s To /tmp/tmp18gsv6fk/upstream
234s  - [deleted]         1.0.0
234s # git branch --remote --list 'origin/*'
234s ................+ export HOME=
234s + HOME=
234s + export GIT_AUTHOR_EMAIL=author1@localhost
234s + GIT_AUTHOR_EMAIL=author1@localhost
234s + export 'GIT_AUTHOR_NAME=Author One'
234s + GIT_AUTHOR_NAME='Author One'
234s + export GIT_COMMITTER_EMAIL=committer2@localhost
234s + GIT_COMMITTER_EMAIL=committer2@localhost
234s + export 'GIT_COMMITTER_NAME=Committer Two'
234s + GIT_COMMITTER_NAME='Committer Two'
234s + git init
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s + echo line1
234s + git add file.txt
234s + git commit -m 'Add file.txt with one line'
234s Initialized empty Git repository in /tmp/tmp18gsv6fk/upstream/.git/
234s [master (root-commit) 629b057] First commit
234s  Author: Author One <author1@localhost>
234s /tmp/tmp18gsv6fk
234s Initialized empty Git repository in /tmp/tmp2qhnhd5u/.git/
234s + git branch merged1
234s [master (root-commit) 5d2e866] Add file.txt with one line
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file.txt
234s + git checkout -b merged2
234s Switched to a new branch 'merged2'
234s + echo line2
234s + git commit -a -m 'Add line 2'
234s [merged2 fdcf8ea] Add line 2
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s Merge made by the 'ort' strategy.
234s  file.txt | 1 +
234s  1 file changed, 1 insertion(+)
234s + git checkout master
234s Switched to branch 'master'
234s + git merge --no-ff --no-edit merged2
234s + git checkout -b not-merged1
234s Switched to a new branch 'not-merged1'
234s + echo line3
234s + git commit -a -m 'Add line 3'
234s [not-merged1 4fed408] Add line 3
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s # git branch
234s # git branch --merged master
234s .+ export HOME=
234s + HOME=
234s + export GIT_AUTHOR_EMAIL=author1@localhost
234s + GIT_AUTHOR_EMAIL=author1@localhost
234s + export 'GIT_AUTHOR_NAME=Author One'
234s + GIT_AUTHOR_NAME='Author One'
234s + export GIT_COMMITTER_EMAIL=committer2@localhost
234s + GIT_COMMITTER_EMAIL=committer2@localhost
234s + export 'GIT_COMMITTER_NAME=Committer Two'
234s + GIT_COMMITTER_NAME='Committer Two'
234s + git init
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s + echo line1
234s + git add file1.txt
234s Initialized empty Git repository in /tmp/tmpfh08wzfb/.git/
234s + git commit -m 'Add file1.txt'
234s [master (root-commit) e7afba4] Add file1.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file1.txt
234s + git checkout -b defacto-merged1
234s Switched to a new branch 'defacto-merged1'
234s + cp file1.txt file2.txt
234s + git add file2.txt
234s + git commit -m 'Add file2.txt'
234s [defacto-merged1 3e4010e] Add file2.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file2.txt
234s + cp file1.txt file3.txt
234s + git add file3.txt
234s + git commit -m 'Add file3.txt'
234s [defacto-merged1 ed23c0f] Add file3.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file3.txt
234s + git checkout -b defacto-merged2 master
234s Switched to a new branch 'defacto-merged2'
234s + cp file1.txt file3.txt
234s + git add file3.txt
234s + git commit -m 'Add file3.txt'
234s [defacto-merged2 1c624da] Add file3.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file3.txt
234s + cp file1.txt file2.txt
234s + git add file2.txt
234s + git commit -m 'Add file2.txt'
234s [defacto-merged2 f3e20f8] Add file2.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file2.txt
234s + git checkout master
234s Switched to branch 'master'
234s + cp file1.txt file4.txt
234s + git add file4.txt
234s + git commit -m 'Add file4.txt'
234s [master 9910453] Add file4.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file4.txt
234s + git cherry-pick 'defacto-merged1^' defacto-merged1
234s [master 8b51f39] Add file2.txt
234s  Author: Author One <author1@localhost>
234s  Date: Thu Mar 21 22:46:11 2024 +0000
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file2.txt
234s [master eaf91d5] Add file3.txt
234s  Author: Author One <author1@localhost>
234s  Date: Thu Mar 21 22:46:11 2024 +0000
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file3.txt
234s + git checkout -b not-defacto-merged1 defacto-merged1
234s Switched to a new branch 'not-defacto-merged1'
234s + cp file1.txt file5.txt
234s + git add file5.txt
234s + git commit -m 'Add file5.txt'
234s [not-defacto-merged1 8105c82] Add file5.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file5.txt
234s # git branch
234s # git branch --merged master
234s # git branch
234s # git cherry master defacto-merged1
234s # git cherry master defacto-merged2
234s # git cherry master not-defacto-merged1
234s .+ export HOME=
234s + HOME=
234s + export GIT_AUTHOR_EMAIL=author1@localhost
234s + GIT_AUTHOR_EMAIL=author1@localhost
234s + export 'GIT_AUTHOR_NAME=Author One'
234s + GIT_AUTHOR_NAME='Author One'
234s + export GIT_COMMITTER_EMAIL=committer2@localhost
234s + GIT_COMMITTER_EMAIL=committer2@localhost
234s + export 'GIT_COMMITTER_NAME=Committer Two'
234s + GIT_COMMITTER_NAME='Committer Two'
234s + git init
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s Initialized empty Git repository in /tmp/tmp26fgk1uw/.git/
234s + echo line1
234s + git add file1.txt
234s + git commit -m 'Add file1.txt'
234s [master (root-commit) e7afba4] Add file1.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file1.txt
234s + git checkout -b defacto-squash-merged1
234s Switched to a new branch 'defacto-squash-merged1'
234s + cp file1.txt file2.txt
234s + git add file2.txt
234s + git commit -m 'Add file2.txt'
234s [defacto-squash-merged1 3e4010e] Add file2.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file2.txt
234s + cp file1.txt file3.txt
234s + git add file3.txt
234s + git commit -m 'Add file3.txt'
234s [defacto-squash-merged1 ed23c0f] Add file3.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file3.txt
234s + git checkout -b defacto-squash-merged2
234s Switched to a new branch 'defacto-squash-merged2'
234s + git revert --no-edit HEAD
234s [defacto-squash-merged2 87b3f17] Revert "Add file3.txt"
234s  Author: Author One <author1@localhost>
234s  Date: Thu Mar 21 22:46:11 2024 +0000
234s  1 file changed, 1 deletion(-)
234s  delete mode 100644 file3.txt
234s + git revert --no-edit HEAD
234s [defacto-squash-merged2 b0deb11] Reapply "Add file3.txt"
234s  Author: Author One <author1@localhost>
234s  Date: Thu Mar 21 22:46:11 2024 +0000
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 file3.txt
234s + git checkout master
234s Switched to branch 'master'
234s + git merge --squash defacto-squash-merged1
234s Updating e7afba4..ed23c0f
234s Fast-forward
234s Squash commit -- not updating HEAD
234s  file2.txt | 1 +
234s  file3.txt | 1 +
234s  2 files changed, 2 insertions(+)
234s  create mode 100644 file2.txt
234s  create mode 100644 file3.txt
234s + git commit -m 'Add squashed copy of '\''defacto-squash-merged1'\'''
234s + git checkout -b not-defacto-squash-merged1
234s [master 8975e4c] Add squashed copy of 'defacto-squash-merged1'
234s  Author: Author One <author1@localhost>
234s  2 files changed, 2 insertions(+)
234s  create mode 100644 file2.txt
234s  create mode 100644 file3.txt
234s Switched to a new branch 'not-defacto-squash-merged1'
234s + git revert --no-edit HEAD
234s [not-defacto-squash-merged1 b16ed92] Revert "Add squashed copy of 'defacto-squash-merged1'"
234s  Author: Author One <author1@localhost>
234s  Date: Thu Mar 21 22:46:11 2024 +0000
234s  2 files changed, 2 deletions(-)
234s  delete mode 100644 file2.txt
234s  delete mode 100644 file3.txt
234s # git branch
234s # git branch --merged master
234s # git branch
234s # git cherry master defacto-squash-merged1
234s # git cherry master defacto-squash-merged2
234s # git cherry master not-defacto-squash-merged1
234s # git worktree list --porcelain
234s # git diff --exit-code --quiet
234s # git diff --exit-code --quiet --cached
234s # git merge-base master defacto-squash-merged1
234s # git commit-tree -m "Squash-merge 'defacto-squash-merged1'" -p e7afba46f26ce409103e3eb30ae550c751e80cf5 'defacto-squash-merged1^{tree}'
234s # git cherry master 16ca34b7bd54c2a54c24ce34acfc4d44091d2734
234s # git merge-base master defacto-squash-merged2
234s # git commit-tree -m "Squash-merge 'defacto-squash-merged2'" -p e7afba46f26ce409103e3eb30ae550c751e80cf5 'defacto-squash-merged2^{tree}'
234s # git cherry master 0579d218894b9cd2bcb12d7b408839c9a727ae34
234s .+ export HOME=
234s + HOME=
234s + export GIT_AUTHOR_EMAIL=author1@localhost
234s + GIT_AUTHOR_EMAIL=author1@localhost
234s + export 'GIT_AUTHOR_NAME=Author One'
234s + GIT_AUTHOR_NAME='Author One'
234s + export GIT_COMMITTER_EMAIL=committer2@localhost
234s + GIT_COMMITTER_EMAIL=committer2@localhost
234s + export 'GIT_COMMITTER_NAME=Committer Two'
234s + GIT_COMMITTER_NAME='Committer Two'
234s + mkdir upstream
234s + cd upstream
234s + git init
234s hint: Using 'master' as the name for the initial branch. This default branch name
234s hint: is subject to change. To configure the initial branch name to use in all
234s hint: of your new repositories, which will suppress this warning, call:
234s hint: 
234s hint: 	git config --global init.defaultBranch <name>
234s hint: 
234s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
234s hint: 'development'. The just-created branch can be renamed via this command:
234s hint: 
234s hint: 	git branch -m <name>
234s + git commit --allow-empty -m 'Dummy commit #1'
234s Initialized empty Git repository in /tmp/tmp9u6pug32/upstream/.git/
234s + git branch pull-works
234s [master (root-commit) c7613da] Dummy commit #1
234s  Author: Author One <author1@localhost>
234s + git branch pull-trouble
234s + git checkout -b checkout-trouble
234s Switched to a new branch 'checkout-trouble'
234s + echo line1
234s + git add collision.txt
234s + git commit -m 'Add collision.txt'
234s + git checkout master
234s [checkout-trouble 7118451] Add collision.txt
234s  Author: Author One <author1@localhost>
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 collision.txt
234s Switched to branch 'master'
234s + cd ..
234s + git clone -o upstream upstream downstream
234s Cloning into 'downstream'...
234s done.
234s + cd downstream
234s + git branch --track checkout-trouble upstream/checkout-trouble
234s branch 'checkout-trouble' set up to track 'upstream/checkout-trouble'.
234s + git branch --track pull-trouble upstream/pull-trouble
234s + git branch --track pull-works upstream/pull-works
234s branch 'pull-trouble' set up to track 'upstream/pull-trouble'.
234s branch 'pull-works' set up to track 'upstream/pull-works'.
234s + cd ..
234s + cd upstream
234s + git checkout pull-trouble
234s Switched to branch 'pull-trouble'
234s + git merge --ff checkout-trouble
234s Updating c7613da..7118451
234s Fast-forward
234s  collision.txt | 1 +
234s  1 file changed, 1 insertion(+)
234s  create mode 100644 collision.txt
234s + git checkout pull-works
234s Switched to branch 'pull-works'
234s + git commit --allow-empty -m 'Dummy commit #2'
234s + cd ..
234s + cd downstream
234s + git checkout -b topic1
234s [pull-works 3818e19] Dummy commit #2
234s  Author: Author One <author1@localhost>
234s Switched to a new branch 'topic1'
234s + echo line1
234s # git rev-parse --symbolic-full-name HEAD
234s # git branch
234s # git remote update --prune upstream
234s From /tmp/tmp9u6pug32/upstream
234s    c7613da..7118451  pull-trouble -> upstream/pull-trouble
234s    c7613da..3818e19  pull-works   -> upstream/pull-works
234s # git cherry pull-works upstream/pull-works
234s # git rev-parse --symbolic-full-name HEAD
234s # git worktree list --porcelain
234s # git diff --exit-code --quiet
234s # git diff --exit-code --quiet --cached
234s # git checkout -q checkout-trouble
234s error: The following untracked working tree files would be overwritten by checkout:
234s 	collision.txt
234s Please move or remove them before you switch branches.
234s Aborting
234s Error: Refreshing local branch 'checkout-trouble' failed because the branch cannot be checkout out.
234s # git checkout -q pull-trouble
234s # git pull --ff-only
234s error: The following untracked working tree files would be overwritten by merge:
234s 	collision.txt
234s Please move or remove them before you merge.
234s Aborting
234s Error: Refreshing local branch 'pull-trouble' failed because the branch cannot be pulled with fast forward.
234s # git checkout -q pull-works
234s # git pull --ff-only
234s # git checkout -q topic1
234s # git cherry pull-works upstream/pull-works
234s # git rev-parse --symbolic-full-name HEAD
234s .
234s ----------------------------------------------------------------------
234s Ran 30 tests in 0.354s
234s 
234s OK
234s autopkgtest [22:46:11]: test command1: -----------------------]
235s command1             PASS
235s autopkgtest [22:46:12]: test command1:  - - - - - - - - - - results - - - - - - - - - -
235s autopkgtest [22:46:12]: @@@@@@@@@@@@@@@@@@@@ summary
235s command1             PASS
260s Creating nova instance adt-noble-s390x-git-delete-merged-branches-20240321-224217-juju-7f2275-prod-proposed-migration-environment-2 from image adt/ubuntu-noble-s390x-server-20240321.img (UUID a4b1c77c-a35e-4d28-a8d9-902a1febb465)...