Mercurial > hg > hg-git
comparison tests/test-subrepos.t @ 999:ff663d2214db
test-subrepos: update to account for newer git output
git 2.9 outputs a longer path during clone than 2.8 did. Update the tests to
allow either behavior.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Mon, 12 Sep 2016 07:40:42 -0700 |
parents | 270962e56813 |
children |
comparison
equal
deleted
inserted
replaced
998:7b11e6348810 | 999:ff663d2214db |
---|---|
14 $ cd gitrepo1 | 14 $ cd gitrepo1 |
15 $ echo alpha > alpha | 15 $ echo alpha > alpha |
16 $ git add alpha | 16 $ git add alpha |
17 $ fn_git_commit -m 'add alpha' | 17 $ fn_git_commit -m 'add alpha' |
18 $ git submodule add ../gitsubrepo subrepo1 | 18 $ git submodule add ../gitsubrepo subrepo1 |
19 Cloning into 'subrepo1'... | 19 Cloning into '*subrepo1'... (glob) |
20 done. | 20 done. |
21 $ fn_git_commit -m 'add subrepo1' | 21 $ fn_git_commit -m 'add subrepo1' |
22 $ git submodule add ../gitsubrepo xyz/subrepo2 | 22 $ git submodule add ../gitsubrepo xyz/subrepo2 |
23 Cloning into 'xyz/subrepo2'... | 23 Cloning into '*xyz/subrepo2'... (glob) |
24 done. | 24 done. |
25 $ fn_git_commit -m 'add subrepo2' | 25 $ fn_git_commit -m 'add subrepo2' |
26 we are going to push to this repo from our hg clone, | 26 we are going to push to this repo from our hg clone, |
27 allow commits despite working copy presense | 27 allow commits despite working copy presense |
28 $ git config receive.denyCurrentBranch ignore | 28 $ git config receive.denyCurrentBranch ignore |