Mercurial > hg-stable
changeset 26040:97208371715a stable
test-convert-git: work around output format changes in git
git version 2.4.3:
--- /home/augie/hg/tests/test-convert-git.t
+++ /home/augie/hg/tests/test-convert-git.t.err
@@ -659,7 +659,7 @@
$ touch a && git add a && git commit -am "commit a"
[master (root-commit) 8ae5f69] commit a
Author: nottest <test@example.org>
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a
$ cd ..
$ git clone git-repo7 git-repo7-client
git version 1.7.9.5:
--- /home/augie/hg/tests/test-convert-git.t
+++ /home/augie/hg/tests/test-convert-git.t.err
@@ -659,7 +659,7 @@
$ touch a && git add a && git commit -am "commit a"
[master (root-commit) 8ae5f69] commit a
Author: nottest <test@example.org>
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
create mode 100644 a
$ cd ..
$ git clone git-repo7 git-repo7-client
I don't know when this changed in git and am too lazy to try and
bisect it, so just work around the change.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 17 Aug 2015 19:03:58 -0400 |
| parents | 563ea14c62d4 |
| children | b930d4ef7739 |
| files | tests/test-convert-git.t |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-git.t Tue Aug 11 16:45:11 2015 -0700 +++ b/tests/test-convert-git.t Mon Aug 17 19:03:58 2015 -0400 @@ -656,10 +656,12 @@ $ git init git-repo7 Initialized empty Git repository in $TESTTMP/git-repo7/.git/ $ cd git-repo7 - $ touch a && git add a && git commit -am "commit a" +TODO: it'd be nice to use (?) lines instead of grep -v to handle the +git output variance, but that doesn't currently work in the middle of +a block, so do this for now. + $ touch a && git add a && git commit -am "commit a" | grep -v changed [master (root-commit) 8ae5f69] commit a Author: nottest <test@example.org> - 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 a $ cd .. $ git clone git-repo7 git-repo7-client