summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-08-12 16:28:22 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-12 16:33:47 (GMT)
commit05d8377e3131af101f444e079347953587a2b0d6 (patch)
tree5deb3ed3cece5a7a9c8db849a2f7ff56254a0374
parent6c9a5d65d615abf75e640f5ceda332ef42854d57 (diff)
downloadmorph-05d8377e3131af101f444e079347953587a2b0d6.tar.gz
Yarns: misc fixes
-rw-r--r--yarns/branches-workspaces.yarn4
-rw-r--r--yarns/implementations.yarn2
2 files changed, 3 insertions, 3 deletions
diff --git a/yarns/branches-workspaces.yarn b/yarns/branches-workspaces.yarn
index 96fbbd1..0753296 100644
--- a/yarns/branches-workspaces.yarn
+++ b/yarns/branches-workspaces.yarn
@@ -168,8 +168,8 @@ branches checked out.
Editing components
------------------
-`morph edit` can edit refs for a stratum only, or it can do that for
-a chunk, and check out the chunk's repository.
+`morph edit` can edit refs for a chunk, and check out the chunk's
+repository.
First of all, we verify that that when we create a system branch,
all the refs are unchanged.
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 5b5b172..f01432b 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -444,7 +444,7 @@ Editing morphologies with `morph edit`.
ls -l "$DATADIR/workspace/$MATCH_2"
chunkdir="$(slashify_colons "$MATCH_1")"
cd "$DATADIR/workspace/$MATCH_2/$chunkdir"
- git branch | awk '$1 == "*" { print $2 }' > "$DATADIR/git-branch.actual"
+ git rev-parse --abbrev-ref HEAD > "$DATADIR/git-branch.actual"
echo "$MATCH_2" > "$DATADIR/git-branch.wanted"
diff -u "$DATADIR/git-branch.wanted" "$DATADIR/git-branch.actual"