--- Begin Message ---
Source: hg-git
Version: 0.10.4-3
Severity: serious
X-Debbugs-CC: g...@packages.debian.org
Tags: sid bookworm
User: debian...@lists.debian.org
Usertags: needs-update
Control: affects -1 src:git
Dear maintainer(s),
With a recent upload of git the autopkgtest of hg-git fails in testing
when that autopkgtest is run with the binary packages of git from
unstable. It passes when run with only packages from testing. In tabular
form:
pass fail
git from testing 1:2.38.1-1
hg-git from testing 0.10.4-3
all others from testing from testing
I copied some of the output at the bottom of this report. This is due to """
* Addresses the security issue CVE-2022-39253: cloning an
attacker-controlled local repository could store arbitrary files
in the ".git" directory of the destination repository.
"""
This has a nice write up:
https://vielmetti.typepad.com/logbook/2022/10/git-security-fixes-lead-to-fatal-transport-file-not-allowed-error-in-ci-systems-cve-2022-39253.html
Currently this regression is blocking the migration of git to testing
[1]. Of course, git shouldn't just break your autopkgtest (or even
worse, your package), but it seems to me that the change in git was
intended and your package needs to update to the new situation.
If this is a real problem in your package (and not only in your
autopkgtest), the right binary package(s) from git should really add a
versioned Breaks on the unfixed version of (one of your) package(s).
Note: the Breaks is nice even if the issue is only in the autopkgtest as
it helps the migration software to figure out the right versions to
combine in the tests.
More information about this bug and the reason for filing it can be found on
https://wiki.debian.org/ContinuousIntegration/RegressionEmailInformation
Paul
[1] https://qa.debian.org/excuses.php?package=git
https://ci.debian.net/data/autopkgtest/testing/amd64/h/hg-git/28079230/log.gz
no username found, using 'debci@ci-313-1f6a2f66' instead
cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg
--blacklist=/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/debian/hg-git.test_blacklist
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/run-tests.py:51:
DeprecationWarning: The distutils package is deprecated and slated for
removal in Python 3.12. Use setuptools or check PEP 632 for potential
alternatives
import distutils.version as version
running 51 tests using 51 parallel processes sssss
---
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-git-submodules.t
+++
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-git-submodules.t.err
@@ -32,385 +32,14 @@
$ git submodule add ../gitsubrepo subrepo 2>&1 | python -c
"$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
+ fatal: transport 'file' not allowed
+ fatal: clone of 'gitrepo2/../gitsubrepo' into submodule path
'gitrepo2/subrepo' failed
$ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//'
- [master e42b08b] add subrepo
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subrepo
+ On branch master
+ Your branch is up to date with 'origin/master'.
+ + nothing to commit, working tree clean
$ cd subrepo
+ $TESTTMP.sh: 42: cd: can't cd to subrepo
$ echo gamma > gamma
- $ git add gamma
- $ fn_git_commit -m 'add gamma'
- $ cd ..
- $ git add subrepo
- $ git commit -m 'change subrepo commit'
- [master a000567] change subrepo commit
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
- $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd"
| sed "$clonefilt" | egrep -v '^done\.$'
- Initialized empty Git repository in ...
- - $ git commit -m 'add another subrepo' | sed 's/, 0 deletions(-)//'
- [master 6e21952] add another subrepo
- 2 files changed, 4 insertions(+)
- create mode 160000 subrepo2
-
-remove one subrepo, replace with file
-
- $ git rm --cached subrepo
- rm 'subrepo'
-we'd ordinarily use sed here, but BSD sed doesn't support two-address
formats
-like +2 -- so use grep with the stuff we want to keep
- $ grep 'submodule "subrepo2"' -A2 .gitmodules > .gitmodules-new
- $ mv .gitmodules-new .gitmodules
- $ git add .gitmodules
- $ git config --unset submodule.subrepo.url
- $ rm -rf subrepo
- $ echo subrepo > subrepo
- $ git add subrepo
- $ git commit -m 'replace subrepo with file' | sed 's/, 0
deletions(-)//' | sed 's/, 0 insertions(+)//'
- [master f6436a4] replace subrepo with file
- 2 files changed, 1 insertion(+), 4 deletions(-)
- mode change 160000 => 100644 subrepo
-
-replace file with subrepo -- apparently, git complains about the
subrepo if the
-same name has existed at any point historically, so use alpha instead
of subrepo
-
- $ git rm alpha
- rm 'alpha'
- $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" |
sed "$clonefilt" | egrep -v '^done\.$'
- Initialized empty Git repository in ...
- - $ git commit -m 'replace file with subrepo' | sed 's/, 0
deletions(-)//' | sed 's/, 0 insertions(+)//'
- [master 8817116] replace file with subrepo
- 2 files changed, 4 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 alpha
-
- $ ln -s foo foolink
- $ git add foolink
- $ git commit -m 'add symlink'
- [master 2d1c135] add symlink
- 1 file changed, 1 insertion(+)
- create mode 120000 foolink
-
-replace symlink with subrepo
-
- $ git rm foolink
- rm 'foolink'
- $ git submodule add ../gitsubrepo foolink 2>&1 | python -c "$rmpwd" |
sed "$clonefilt" | egrep -v '^done\.$'
- Initialized empty Git repository in ...
- - $ git commit -m 'replace symlink with subrepo' | sed 's/, 0
deletions(-)//' | sed 's/, 0 insertions(+)//'
- [master e3288fa] replace symlink with subrepo
- 2 files changed, 4 insertions(+), 1 deletion(-)
- mode change 120000 => 160000 foolink
-
-replace subrepo with symlink
-
- $ cat > .gitmodules <<EOF
- > [submodule "subrepo2"]
- > path = subrepo2
- > url = ../gitsubrepo
- > [submodule "alpha"]
- > path = alpha
- > url = ../gitsubrepo
- > EOF
- $ git add .gitmodules
- $ git rm --cached foolink
- rm 'foolink'
- $ rm -rf foolink
- $ ln -s foo foolink
- $ git add foolink
- $ git commit -m 'replace subrepo with symlink' | sed 's/, 0
deletions(-)//' | sed 's/, 0 insertions(+)//'
- [master d283640] replace subrepo with symlink
- 2 files changed, 1 insertion(+), 4 deletions(-)
- mode change 160000 => 120000 foolink
- $ git show
- commit d28364013fe1a0fde56c0e1921e49ecdeee8571d
- Author: test <t...@example.org>
- Date: Mon Jan 1 00:00:12 2007 +0000
- - replace subrepo with symlink
- - diff --git a/.gitmodules b/.gitmodules
- index b511494..813e20b 100644
- --- a/.gitmodules
- +++ b/.gitmodules
- @@ -4,6 +4,3 @@
- [submodule "alpha"]
- path = alpha
- url = ../gitsubrepo
- -[submodule "foolink"]
- - path = foolink
- - url = ../gitsubrepo
- diff --git a/foolink b/foolink
- deleted file mode 160000
- index 6e4ad8d..0000000
- --- a/foolink
- +++ /dev/null
- @@ -1 +0,0 @@
- -Subproject commit 6e4ad8da50204560c00fa25e4987eb2e239029ba
- diff --git a/foolink b/foolink
- new file mode 120000
- index 0000000..1910281
- --- /dev/null
- +++ b/foolink
- @@ -0,0 +1 @@
- +foo
- \ No newline at end of file
-
- $ git rm --cached subrepo2
- rm 'subrepo2'
- $ git rm --cached alpha
- rm 'alpha'
- $ git rm .gitmodules
- rm '.gitmodules'
- $ git commit -m 'remove all subrepos' | sed 's/, 0 deletions(-)//' |
sed 's/, 0 insertions(+)//'
- [master 15ba949] remove all subrepos
- 3 files changed, 8 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 alpha
- delete mode 160000 subrepo2
-
- $ git log --pretty=oneline
- 15ba94929481c654814178aac1dbca06ae688718 remove all subrepos
- d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink
- e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo
- 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink
- 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo
- f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file
- 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo
- a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit
- e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo
- 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha
-
- $ cd ..
-
- $ hg clone gitrepo2 hgrepo
- importing git objects into hg
- updating to bookmark master (hg57 !)
- updating to branch default (no-hg57 !)
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ cd hgrepo
- $ hg log --graph
- @ changeset: 9:9c3929c04f22
- | bookmark: master
- | tag: default/master
- | tag: tip
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: remove all subrepos
- |
- o changeset: 8:1b71dd3e6033
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace subrepo with symlink
- |
- o changeset: 7:e338dc0b9f64
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace symlink with subrepo
- |
- o changeset: 6:db94aa767571
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: add symlink
- |
- o changeset: 5:87bae50d72cb
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace file with subrepo
- |
- o changeset: 4:33729ae46d57
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace subrepo with file
- |
- o changeset: 3:4d2f0f4fb53d
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: add another subrepo
- |
- o changeset: 2:620c9d5e9a98
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: change subrepo commit
- |
- o changeset: 1:f20b40ad6da1
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:11 2007 +0000
- | summary: add subrepo
- |
- o changeset: 0:ff7a2f2d8d70
- user: test <t...@example.org>
- date: Mon Jan 01 00:00:10 2007 +0000
- summary: add alpha
- - $ hg book
- * master 9:9c3929c04f22
-
-(add subrepo)
- $ hg cat -r 1 .hgsubstate
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo
- $ hg cat -r 1 .hgsub
- subrepo = [git]../gitsubrepo
- $ hg gverify -r 1
- verifying rev f20b40ad6da1 against git commit
e42b08b3cb7069b4594a4ee1d9cb641ee47b2355
-
-(change subrepo commit)
- $ hg cat -r 2 .hgsubstate
- aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo
- $ hg cat -r 2 .hgsub
- subrepo = [git]../gitsubrepo
- $ hg gverify -r 2
- verifying rev 620c9d5e9a98 against git commit
a000567ceefbd9a2ce364e0dea6e298010b02b6d
-
-(add another subrepo)
- $ hg cat -r 3 .hgsubstate
- aa2ead20c29b5cc6256408e1d9ef704870033afb subrepo
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2
- $ hg cat -r 3 .hgsub
- subrepo = [git]../gitsubrepo
- subrepo2 = [git]../gitsubrepo
- $ hg gverify -r 3
- verifying rev 4d2f0f4fb53d against git commit
6e219527869fa40eb6ffbdd013cd86d576b26b01
-
-(replace subrepo with file)
- $ hg cat -r 4 .hgsubstate
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2
- $ hg cat -r 4 .hgsub
- subrepo2 = [git]../gitsubrepo
- $ hg manifest -r 4
- .gitmodules
- .hgsub
- .hgsubstate
- alpha
- subrepo
- $ hg gverify -r 4
- verifying rev 33729ae46d57 against git commit
f6436a472da00f581d8d257e9bbaf3c358a5e88c
-
-(replace file with subrepo)
- $ hg cat -r 5 .hgsubstate
- 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2
- $ hg cat -r 5 .hgsub
- subrepo2 = [git]../gitsubrepo
- alpha = [git]../gitsubrepo
- $ hg manifest -r 5
- .gitmodules
- .hgsub
- .hgsubstate
- subrepo
- $ hg gverify -r 5
- verifying rev 87bae50d72cb against git commit
88171163bf4795b5570924e51d5f8ede33f8bc28
-
-(replace symlink with subrepo)
- $ hg cat -r 7 .hgsub
- subrepo2 = [git]../gitsubrepo
- alpha = [git]../gitsubrepo
- foolink = [git]../gitsubrepo
- $ hg cat -r 7 .hgsubstate
- 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha
- 6e4ad8da50204560c00fa25e4987eb2e239029ba foolink
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2
- $ hg gverify -r 7
- verifying rev e338dc0b9f64 against git commit
e3288fa737d429a60637b3b6782cb25b8298bc00
-
-(replace subrepo with symlink)
- $ hg cat -r 8 .hgsub .hgsubstate
- subrepo2 = [git]../gitsubrepo
- alpha = [git]../gitsubrepo
- 6e4ad8da50204560c00fa25e4987eb2e239029ba alpha
- 6e4ad8da50204560c00fa25e4987eb2e239029ba subrepo2
-
- $ hg gverify -r 8
- verifying rev 1b71dd3e6033 against git commit
d28364013fe1a0fde56c0e1921e49ecdeee8571d
-
-(remove all subrepos)
- $ hg cat -r 9 .hgsub .hgsubstate
- .hgsub: no such file in rev 9c3929c04f22
- .hgsubstate: no such file in rev 9c3929c04f22
- [1]
- $ hg gverify -r 9
- verifying rev 9c3929c04f22 against git commit
15ba94929481c654814178aac1dbca06ae688718
-
- $ hg gclear
- clearing out the git cache data
- $ hg gexport
- $ cd .hg/git
- $ git log --pretty=oneline
- 15ba94929481c654814178aac1dbca06ae688718 remove all subrepos
- d28364013fe1a0fde56c0e1921e49ecdeee8571d replace subrepo with symlink
- e3288fa737d429a60637b3b6782cb25b8298bc00 replace symlink with subrepo
- 2d1c135447d11df4dfe96dd5d4f37926dc5c821d add symlink
- 88171163bf4795b5570924e51d5f8ede33f8bc28 replace file with subrepo
- f6436a472da00f581d8d257e9bbaf3c358a5e88c replace subrepo with file
- 6e219527869fa40eb6ffbdd013cd86d576b26b01 add another subrepo
- a000567ceefbd9a2ce364e0dea6e298010b02b6d change subrepo commit
- e42b08b3cb7069b4594a4ee1d9cb641ee47b2355 add subrepo
- 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 add alpha
-
-test with rename detection enabled -- simply checking that the
Mercurial hashes
-are the same is enough
- $ cd ../../..
- $ hg --config git.similarity=100 clone gitrepo2 hgreporenames
- importing git objects into hg
- updating to bookmark master (hg57 !)
- updating to branch default (no-hg57 !)
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ cd hgreporenames
- $ hg log --graph
- @ changeset: 9:9c3929c04f22
- | bookmark: master
- | tag: default/master
- | tag: tip
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: remove all subrepos
- |
- o changeset: 8:1b71dd3e6033
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace subrepo with symlink
- |
- o changeset: 7:e338dc0b9f64
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace symlink with subrepo
- |
- o changeset: 6:db94aa767571
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: add symlink
- |
- o changeset: 5:87bae50d72cb
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace file with subrepo
- |
- o changeset: 4:33729ae46d57
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: replace subrepo with file
- |
- o changeset: 3:4d2f0f4fb53d
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: add another subrepo
- |
- o changeset: 2:620c9d5e9a98
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:12 2007 +0000
- | summary: change subrepo commit
- |
- o changeset: 1:f20b40ad6da1
- | user: test <t...@example.org>
- | date: Mon Jan 01 00:00:11 2007 +0000
- | summary: add subrepo
- |
- o changeset: 0:ff7a2f2d8d70
- user: test <t...@example.org>
- date: Mon Jan 01 00:00:10 2007 +0000
- summary: add alpha
-
ERROR: test-git-submodules.t output changed
!.s...
---
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-subrepos.t
+++
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-subrepos.t.err
@@ -17,12 +17,18 @@
$ fn_git_commit -m 'add alpha'
$ git submodule add ../gitsubrepo subrepo1
Cloning into '*subrepo1'... (glob)
- done.
+ fatal: transport 'file' not allowed
+ fatal: clone of '$TESTTMP/gitsubrepo' into submodule path
'$TESTTMP/gitrepo1/subrepo1' failed
+ [128]
$ fn_git_commit -m 'add subrepo1'
+ git commit error
$ git submodule add ../gitsubrepo xyz/subrepo2
Cloning into '*xyz/subrepo2'... (glob)
- done.
+ fatal: transport 'file' not allowed
+ fatal: clone of '$TESTTMP/gitsubrepo' into submodule path
'$TESTTMP/gitrepo1/xyz/subrepo2' failed
+ [128]
$ fn_git_commit -m 'add subrepo2'
+ git commit error
we are going to push to this repo from our hg clone,
allow commits despite working copy presense
$ git config receive.denyCurrentBranch ignore
@@ -31,23 +37,24 @@
$ hg clone -u tip gitrepo1 hgrepo 2>&1 | egrep -v '^(Cloning into|done)'
importing git objects into hg
updating to branch default
- cloning subrepo subrepo1 from $TESTTMP/gitsubrepo
- cloning subrepo xyz/subrepo2 from $TESTTMP/gitsubrepo
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
$ hg bookmarks -f -r default master
1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull
.hgsub shall list two [git] subrepos
$ cat .hgsub | sort
- subrepo1 = [git]../gitsubrepo
- xyz/subrepo2 = [git]../gitsubrepo
+ cat: .hgsub: No such file or directory
.hgsubstate shall list two idenitcal revisions
$ cat .hgsubstate
- 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
- 56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2
+ cat: .hgsubstate: No such file or directory
+ [1]
hg status shall NOT report .hgsub and .hgsubstate as untracked -
either ignored or unmodified
$ hg status --unknown .hgsub .hgsubstate
+ .hgsub: No such file or directory
+ .hgsubstate: No such file or directory
$ hg status --modified .hgsub .hgsubstate
+ .hgsub: No such file or directory
+ .hgsubstate: No such file or directory
$ cd ..
2. Check gitmodules are preserved during hg -> git push
@@ -58,62 +65,5 @@
$ cd ..
$ cd hgrepo
$ cd xyz/subrepo2
+ $TESTTMP.sh: 66: cd: can't cd to xyz/subrepo2
$ git pull --ff-only | sed
's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/|
*/| /'
- From $TESTTMP/gitsubrepo
- 56f0304..aabf7cd master -> origin/master
- Updating 56f0304..aabf7cd
- Fast-forward
- gamma | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 gamma
- $ cd ../..
- $ echo xxx >> alpha
- $ hg commit -m 'Update subrepo2 from hg' | grep -v "committing
subrepository" || true
- $ hg push
- pushing to $TESTTMP/gitrepo1
- searching for changes
- adding objects
- added 1 commits with 2 trees and 1 blobs
- updating reference refs/heads/master
- $ cd ..
- $ cd gitrepo1
-there shall be two gitlink entries, with values matching that in
.hgsubstate
- $ git ls-tree -r HEAD^{tree} | grep 'commit'
- 160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
- 160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2
-bring working copy to HEAD state (it's not bare repo)
- $ git reset --hard
- HEAD is now at ae335e3 Update subrepo2 from hg
- $ cd ..
-
-3. Check .hgsub and .hgsubstate from git repository are merged, not
overwritten
- $ hg init hgsub
- $ cd hgsub
- $ echo delta > delta
- $ hg add delta
- $ fn_hg_commit -m "add delta"
- $ echo "`hg tip --template '{node}'` hgsub" > ../gitrepo1/.hgsubstate
- $ echo "hgsub = $(pwd)" > ../gitrepo1/.hgsub
- $ cd ../gitrepo1
- $ git add .hgsubstate .hgsub
- $ fn_git_commit -m "Test3. Prepare .hgsub and .hgsubstate sources"
- $ cd ../hgrepo
- $ hg pull
- pulling from $TESTTMP/gitrepo1
- importing git objects into hg
- (run 'hg update' to get a working copy)
- $ hg checkout -C
- updating to active bookmark master
- cloning subrepo hgsub from $TESTTMP/hgsub
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ cd ..
-pull shall bring .hgsub entry which was added to the git repo
- $ cat hgrepo/.hgsub | sort
- hgsub = $TESTTMP/hgsub
- subrepo1 = [git]../gitsubrepo
- xyz/subrepo2 = [git]../gitsubrepo
-.hgsubstate shall list revision of the subrepo added through git repo
- $ cat hgrepo/.hgsubstate
- 481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub
- 56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
- aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2
ERROR: test-subrepos.t output changed
!................................
--- /tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-renames.t
+++
/tmp/autopkgtest-lxc.dy2eo59z/downtmp/build.WMG/src/tests/test-renames.t.err
@@ -41,19 +41,29 @@
$ git submodule add ../gitsubmodule 2>&1 | python -c "$rmpwd" | sed
"$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
+ fatal: transport 'file' not allowed
+ fatal: clone of 'gitsubmodule' into submodule path
'gitrepo/gitsubmodule' failed
$ fn_git_commit -m 'add submodule'
+ git commit error
$ sed -e 's/path = gitsubmodule/path = gitsubmodule2/' .gitmodules >
.gitmodules-new
+ sed: can't read .gitmodules: No such file or directory
+ [2]
$ mv .gitmodules-new .gitmodules
$ mv gitsubmodule gitsubmodule2
+ mv: cannot stat 'gitsubmodule': No such file or directory
+ [1]
Previous versions of git did not produce any output but 2.14 changed
the output
to warn the user about submodules
$ git add .gitmodules gitsubmodule2 2>/dev/null
+ [128]
$ git rm --cached gitsubmodule
- rm 'gitsubmodule'
+ fatal: pathspec 'gitsubmodule' did not match any files
+ [128]
$ fn_git_commit -m 'move submodule'
+ git commit error
Rename a file elsewhere and replace it with a symlink:
@@ -74,16 +84,20 @@
$ git mv gamma gamma-new
$ git submodule add ../gitsubmodule gamma 2>&1 | python -c "$rmpwd"
| sed "$clonefilt" | egrep -v '^done\.$'
Initialized empty Git repository in ...
+ fatal: transport 'file' not allowed
+ fatal: clone of 'gitsubmodule' into submodule path 'gitrepo/gamma' failed
$ fn_git_commit -m 'rename and add submodule'
Remove the submodule and rename the file back:
$ grep 'submodule "gitsubmodule"' -A2 .gitmodules > .gitmodules-new
+ [1]
$ mv .gitmodules-new .gitmodules
$ git add .gitmodules
$ git rm --cached gamma
- rm 'gamma'
+ fatal: pathspec 'gamma' did not match any files
+ [128]
$ rm -rf gamma
$ git mv gamma-new gamma
$ fn_git_commit -m 'remove submodule and rename back'
@@ -99,65 +113,23 @@
$ cd hgrepo
$ hg book master -q
$ hg log -p --graph --template "{rev} {node}
{desc|firstline}\n{join(extras, ' ')}\n\n"
- @ 8 a26f94023ab2ea40c9e4c4dbb753c9a4e572fefe remove submodule and
rename back
+ @ 6 2444463e8896b4cbf9959c0d32dbf4049c40fcae remove submodule and
rename back
| branch=default hg-git-rename-source=git
|
| diff --git a/.gitmodules b/.gitmodules
- | --- a/.gitmodules
- | +++ b/.gitmodules
- | @@ -1,6 +1,3 @@
- | [submodule "gitsubmodule"]
- | path = gitsubmodule2
- | url = ../gitsubmodule
- | -[submodule "gamma"]
- | - path = gamma
- | - url = ../gitsubmodule
- | diff --git a/.hgsub b/.hgsub
- | --- a/.hgsub
- | +++ b/.hgsub
- | @@ -1,2 +1,1 @@
- | gitsubmodule2 = [git]../gitsubmodule
- | -gamma = [git]../gitsubmodule
- | diff --git a/.hgsubstate b/.hgsubstate
- | --- a/.hgsubstate
- | +++ b/.hgsubstate
- | @@ -1,2 +1,1 @@
- | -5944b31ff85b415573d1a43eb942e2dea30ab8be gamma
- | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
+ | new file mode 100644
| diff --git a/gamma-new b/gamma
| rename from gamma-new
| rename to gamma
|
- o 7 a7c65d466ee1f33540695666c2e65dcbe3fbe388 rename and add submodule
+ o 5 1649ca9454b1b230943ed9c4405369b5433c6f8b rename and add submodule
| branch=default hg-git-rename-source=git
|
- | diff --git a/.gitmodules b/.gitmodules
- | --- a/.gitmodules
- | +++ b/.gitmodules
- | @@ -1,3 +1,6 @@
- | [submodule "gitsubmodule"]
- | path = gitsubmodule2
- | url = ../gitsubmodule
- | +[submodule "gamma"]
- | + path = gamma
- | + url = ../gitsubmodule
- | diff --git a/.hgsub b/.hgsub
- | --- a/.hgsub
- | +++ b/.hgsub
- | @@ -1,1 +1,2 @@
- | gitsubmodule2 = [git]../gitsubmodule
- | +gamma = [git]../gitsubmodule
- | diff --git a/.hgsubstate b/.hgsubstate
- | --- a/.hgsubstate
- | +++ b/.hgsubstate
- | @@ -1,1 +1,2 @@
- | +5944b31ff85b415573d1a43eb942e2dea30ab8be gamma
- | 5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
| diff --git a/gamma b/gamma-new
| rename from gamma
| rename to gamma-new
|
- o 6 10614bb16f4d240ba81b6a71d76a7aa160621a29 beta renamed back
+ o 4 4d803dc7b45e9fc5daf55a963a9e488d1387048a beta renamed back
| branch=default hg-git-rename-source=git
|
| diff --git a/beta b/beta
@@ -198,7 +170,7 @@
| -11
| -12
|
- o 5 96ad24db491a180ccd330556129d75377e201f63 beta renamed
+ o 3 af8b0125ebd20f6c1d7ee30cbf060b9d4fe1d0d1 beta renamed
| branch=default hg-git-rename-source=git
|
| diff --git a/beta b/beta
@@ -225,54 +197,6 @@
| copy from beta
| copy to beta-new
|
- o 4 d22608e850ea875936802e119831f1789f5d98bd move submodule
- | branch=default hg-git-rename-source=git
- |
- | diff --git a/.gitmodules b/.gitmodules
- | --- a/.gitmodules
- | +++ b/.gitmodules
- | @@ -1,3 +1,3 @@
- | [submodule "gitsubmodule"]
- | - path = gitsubmodule
- | + path = gitsubmodule2
- | url = ../gitsubmodule
- | diff --git a/.hgsub b/.hgsub
- | --- a/.hgsub
- | +++ b/.hgsub
- | @@ -1,1 +1,1 @@
- | -gitsubmodule = [git]../gitsubmodule
- | +gitsubmodule2 = [git]../gitsubmodule
- | diff --git a/.hgsubstate b/.hgsubstate
- | --- a/.hgsubstate
- | +++ b/.hgsubstate
- | @@ -1,1 +1,1 @@
- | -5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule
- | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule2
- |
- o 3 db55fd0e7083555ec886f6175fa0a42a711c6592 add submodule
- | branch=default hg-git-rename-source=git
- |
- | diff --git a/.gitmodules b/.gitmodules
- | new file mode 100644
- | --- /dev/null
- | +++ b/.gitmodules
- | @@ -0,0 +1,3 @@
- | +[submodule "gitsubmodule"]
- | + path = gitsubmodule
- | + url = ../gitsubmodule
- | diff --git a/.hgsub b/.hgsub
- | new file mode 100644
- | --- /dev/null
- | +++ b/.hgsub
- | @@ -0,0 +1,1 @@
- | +gitsubmodule = [git]../gitsubmodule
- | diff --git a/.hgsubstate b/.hgsubstate
- | new file mode 100644
- | --- /dev/null
- | +++ b/.hgsubstate
- | @@ -0,0 +1,1 @@
- | +5944b31ff85b415573d1a43eb942e2dea30ab8be gitsubmodule
- |
o 2 20f9e56b6d006d0403f853245e483d0892b8ac48 gamma
| branch=default hg-git-rename-source=git
|
@@ -344,8 +268,8 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID a725f9bdefe29f1a1db89ad030d9f1ee36b3a440
- # Parent 814ed6aa5bd2867ce5ab80f3c2602155d89027b1
+ # Node ID a70572e9f686dbc78a65b9a1eacfd5af11d0a7af
+ # Parent c4695769d51b4e81e41cc4979b662ab165ba0ae9
delta/epsilon
diff --git a/gamma b/delta
@@ -377,30 +301,28 @@
$ cd ../repo.git
$ git log master --pretty=oneline
- 5f2948d029693346043f320620af99a615930dc4 delta/epsilon
- bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2
- 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back
- 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule
- f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back
- 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed
- d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule
- c610256cb6959852d9e70d01902a06726317affc add submodule
+ 2c137ac323df75100a8fcab5b085e921bdffe2f4 delta/epsilon
+ 8ddaa5a6f1679b74b864a094ddaa88f4a5352449 gamma2
+ 703b4f3c69222a469be685cfdf026b3bd5596ba0 remove submodule and rename back
+ 9f53d94a389f1d668150831d0901550c4bb08c12 rename and add submodule
+ 43788c08bfc6c0223647e28553cf690f500bd2b9 beta renamed back
+ 573d4cdf203fbbbe978af86dd4c3e52bbfdec103 beta renamed
e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma
cc83241f39927232f690d370894960b0d1943a0e beta
938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha
Make sure the right metadata is stored
$ git cat-file commit master^
- tree 0adbde18545845f3b42ad1a18939ed60a9dec7a8
- parent 50d116676a308b7c22935137d944e725d2296f2a
+ tree 48e3529f10885cc99d871b22a0e7e1f80d625aaf
+ parent 703b4f3c69222a469be685cfdf026b3bd5596ba0
author test <none@none> 0 +0000
committer test <none@none> 0 +0000
HG:rename-source hg
gamma2
$ git cat-file commit master
- tree f8f32f4e20b56a5a74582c6a5952c175bf9ec155
- parent bbd2ec050f7fbc64f772009844f7d58a556ec036
+ tree 41940dd2980929d0543148c275ab600728511f72
+ parent 8ddaa5a6f1679b74b864a094ddaa88f4a5352449
author test <none@none> 0 +0000
committer test <none@none> 0 +0000
HG:rename gamma:delta
@@ -419,8 +341,8 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID a725f9bdefe29f1a1db89ad030d9f1ee36b3a440
- # Parent 814ed6aa5bd2867ce5ab80f3c2602155d89027b1
+ # Node ID a70572e9f686dbc78a65b9a1eacfd5af11d0a7af
+ # Parent c4695769d51b4e81e41cc4979b662ab165ba0ae9
delta/epsilon
diff --git a/gamma b/delta
@@ -450,14 +372,12 @@
$ hg gexport
$ cd .hg/git
$ git log master --pretty=oneline
- 5f2948d029693346043f320620af99a615930dc4 delta/epsilon
- bbd2ec050f7fbc64f772009844f7d58a556ec036 gamma2
- 50d116676a308b7c22935137d944e725d2296f2a remove submodule and rename back
- 59fb8e82ea18f79eab99196f588e8948089c134f rename and add submodule
- f95497455dfa891b4cd9b524007eb9514c3ab654 beta renamed back
- 055f482277da6cd3dd37c7093d06983bad68f782 beta renamed
- d7f31298f27df8a9226eddb1e4feb96922c46fa5 move submodule
- c610256cb6959852d9e70d01902a06726317affc add submodule
+ 2c137ac323df75100a8fcab5b085e921bdffe2f4 delta/epsilon
+ 8ddaa5a6f1679b74b864a094ddaa88f4a5352449 gamma2
+ 703b4f3c69222a469be685cfdf026b3bd5596ba0 remove submodule and rename back
+ 9f53d94a389f1d668150831d0901550c4bb08c12 rename and add submodule
+ 43788c08bfc6c0223647e28553cf690f500bd2b9 beta renamed back
+ 573d4cdf203fbbbe978af86dd4c3e52bbfdec103 beta renamed
e1348449e0c3a417b086ed60fc13f068d4aa8b26 gamma
cc83241f39927232f690d370894960b0d1943a0e beta
938bb65bb322eb4a3558bec4cdc8a680c4d1794c alpha
ERROR: test-renames.t output changed
!......
Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter
Skipped test-encoding.t: blacklisted
Skipped test-git-gpg.t: missing feature: gpg client
Skipped test-gitignore-windows.t: missing feature: Windows
Skipped test-incoming.t: blacklisted
Skipped test-networking.t: skipped
Failed test-git-submodules.t: output changed and returned error code 1
Failed test-renames.t: output changed
Failed test-subrepos.t: output changed and returned error code 1
# Ran 45 tests, 6 skipped, 3 failed.
python hash seed: 1332923779
make: *** [Makefile:15: tests] Error 1
autopkgtest [20:15:13]: test testsuite
OpenPGP_signature
Description: OpenPGP digital signature
--- End Message ---
