diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-23 16:51:27 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-23 16:51:27 +0000 |
commit | a117a2149cbfbe9df99b92df37e9a9c307256369 (patch) | |
tree | 119b2849381c07eff98913cdc47cf6171166b59b /tests.branching | |
parent | eb591e2ccd511aa3d9e33af49efdb2c7ce10fc9e (diff) | |
download | morph-a117a2149cbfbe9df99b92df37e9a9c307256369.tar.gz |
Modify "morph edit" test to verify origin is set correctly
Diffstat (limited to 'tests.branching')
-rwxr-xr-x | tests.branching/edit-clones-chunk.script | 8 | ||||
-rw-r--r-- | tests.branching/edit-clones-chunk.stdout | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index c4d84cda..f6f4e5e8 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -31,6 +31,14 @@ cd newbranch/morphs echo "Current branches, morphs:" "$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/morphs" branch + +echo "Current origin, morphs:" +"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/morphs" \ + remote show origin | sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' + echo "Current branches, hello:" "$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/hello" branch +echo "Current origin, hello:" +"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/hello" \ + remote show origin | sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout index b5dd24d6..a8659665 100644 --- a/tests.branching/edit-clones-chunk.stdout +++ b/tests.branching/edit-clones-chunk.stdout @@ -1,6 +1,28 @@ Current branches, morphs: master * newbranch +Current origin, morphs: +* remote origin + Fetch URL: file://TMP/morphs + Push URL: file://TMP/morphs + HEAD branch: master + Remote branch: + master tracked + Local branch configured for 'git pull': + master merges with remote master + Local ref configured for 'git push': + master pushes to master (up to date) Current branches, hello: master * newbranch +Current origin, hello: +* remote origin + Fetch URL: file://TMP/hello + Push URL: file://TMP/hello + HEAD branch: master + Remote branch: + master tracked + Local branch configured for 'git pull': + master merges with remote master + Local ref configured for 'git push': + master pushes to master (up to date) |