diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-22 12:21:56 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-22 12:24:55 +0000 |
| commit | b8c60ccaa8c36590d0c2b367faf52235e96f94d5 (patch) | |
| tree | dfdd3dcd4b0145af73055e5628ab59cf5dfc2f91 /tests.branching | |
| parent | 35ee3e342b0eb2a3224c2bc11c9455c8b25d8947 (diff) | |
| download | morph-b8c60ccaa8c36590d0c2b367faf52235e96f94d5.tar.gz | |
Remove needless git output from test result
This output varies depending on the version of git, which currently
causes the test to fail on systems with git 1.7.10.
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/tag-works-with-multiple-morphs-repos.script | 8 | ||||
| -rw-r--r-- | tests.branching/tag-works-with-multiple-morphs-repos.stdout | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script index c80c0564..9819cc37 100755 --- a/tests.branching/tag-works-with-multiple-morphs-repos.script +++ b/tests.branching/tag-works-with-multiple-morphs-repos.script @@ -70,9 +70,9 @@ cat <<EOF > "$DATADIR/repos/morphs1/stratum1.morph" EOF # Commit all files to the first repository. -scripts/run-git-in "$DATADIR/repos/morphs1" init +scripts/run-git-in "$DATADIR/repos/morphs1" init -q scripts/run-git-in "$DATADIR/repos/morphs1" add . -scripts/run-git-in "$DATADIR/repos/morphs1" commit -m initial +scripts/run-git-in "$DATADIR/repos/morphs1" commit -q -m initial # Create second morphs repository. mkdir "$DATADIR/repos/morphs2" @@ -99,9 +99,9 @@ cat <<EOF > "$DATADIR/repos/morphs2/stratum3.morph" EOF # Commit all files to the second repository. -"$SRCDIR/scripts/run-git-in" "$DATADIR/repos/morphs2" init +"$SRCDIR/scripts/run-git-in" "$DATADIR/repos/morphs2" init -q "$SRCDIR/scripts/run-git-in" "$DATADIR/repos/morphs2" add . -"$SRCDIR/scripts/run-git-in" "$DATADIR/repos/morphs2" commit -m initial +"$SRCDIR/scripts/run-git-in" "$DATADIR/repos/morphs2" commit -q -m initial cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout index 98be9086..da49dfe1 100644 --- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout +++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout @@ -1,13 +1,3 @@ -Initialized empty Git repository in TMP/repos/morphs1/.git/ -[master (root-commit) 0bfadac] initial - 2 files changed, 30 insertions(+), 0 deletions(-) - create mode 100644 stratum1.morph - create mode 100644 test-system.morph -Initialized empty Git repository in TMP/repos/morphs2/.git/ -[master (root-commit) 06b1b9c] initial - 2 files changed, 15 insertions(+), 0 deletions(-) - create mode 100644 stratum2.morph - create mode 100644 stratum3.morph tag tag-across-multiple-repos Tagger: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 |