From 6935a3db514f1552c2ffd4d24b6521bb185dcd73 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Fri, 31 Aug 2012 14:59:35 +0000 Subject: Use git config to store the branch root in .morph-system-branch/config This way we can store more branch config options in the future more conveniently without having store them all in separate files or writing our own code to parse the options into a branch config object or something like that. --- tests.branching/branch-creates-new-system-branch-not-from-master.stdout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout') diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index d68a6342..443f325b 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -9,7 +9,7 @@ d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/baserock:morphs d ./newbranch/baserock:morphs/.git -f ./newbranch/.morph-system-branch/branch-root +f ./newbranch/.morph-system-branch/config f ./newbranch/baserock:morphs/hello-stratum.morph f ./newbranch/baserock:morphs/hello-system.morph f ./newbranch/baserock:morphs/this.is.alfred -- cgit v1.2.1