Merge branch 'samthursfield/branch-fixes'

Reviewed-By: Lars Wirzenius (on IRC)

11 files changed, 4 insertions, 47 deletions

diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script
deleted file mode 100755
index b933996b..00000000
--- a/tests.branching/edit-uses-ref-from-stratum.script
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012  Codethink Limited
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-## Verify that "morph edit" clones a chunk repository into a system branch.
-
-set -eu
-
-# Create system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
-
-# Edit chunk.
-"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
-
-"$SRCDIR/scripts/run-git-in" "newbranch/test:hello" branch
diff --git a/tests.branching/edit-uses-ref-from-stratum.stdout b/tests.branching/edit-uses-ref-from-stratum.stdout
deleted file mode 100644
index d14c4c96..00000000
--- a/tests.branching/edit-uses-ref-from-stratum.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-  master
-* newbranch
diff --git a/tests.branching/morph-tag-creates-commit-and-tag.script b/tests.branching/tag-creates-commit-and-tag.script
index e66d981f..e66d981f 100755
--- a/tests.branching/morph-tag-creates-commit-and-tag.script
+++ b/tests.branching/tag-creates-commit-and-tag.script
diff --git a/tests.branching/morph-tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout
index 8c36ede3..8c36ede3 100644
--- a/tests.branching/morph-tag-creates-commit-and-tag.stdout
+++ b/tests.branching/tag-creates-commit-and-tag.stdout
diff --git a/tests.branching/morph-tag-fails-if-tag-exists.exit b/tests.branching/tag-fails-if-tag-exists.exit
index d00491fd..d00491fd 100644
--- a/tests.branching/morph-tag-fails-if-tag-exists.exit
+++ b/tests.branching/tag-fails-if-tag-exists.exit
diff --git a/tests.branching/morph-tag-fails-if-tag-exists.script b/tests.branching/tag-fails-if-tag-exists.script
index b02f87dc..b02f87dc 100755
--- a/tests.branching/morph-tag-fails-if-tag-exists.script
+++ b/tests.branching/tag-fails-if-tag-exists.script
diff --git a/tests.branching/morph-tag-fails-if-tag-exists.stderr b/tests.branching/tag-fails-if-tag-exists.stderr
index b774dfba..b774dfba 100644
--- a/tests.branching/morph-tag-fails-if-tag-exists.stderr
+++ b/tests.branching/tag-fails-if-tag-exists.stderr
diff --git a/tests.branching/morph-tag-tag-works-as-expected.script b/tests.branching/tag-tag-works-as-expected.script
index 14c2ad3e..14c2ad3e 100755
--- a/tests.branching/morph-tag-tag-works-as-expected.script
+++ b/tests.branching/tag-tag-works-as-expected.script
diff --git a/tests.branching/morph-tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout
index ec12ba66..ec12ba66 100644
--- a/tests.branching/morph-tag-tag-works-as-expected.stdout
+++ b/tests.branching/tag-tag-works-as-expected.stdout
diff --git a/tests.branching/morph-tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script
index c80c0564..9819cc37 100755
--- a/tests.branching/morph-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/morph-tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
index 98be9086..da49dfe1 100644
--- a/tests.branching/morph-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