From 8c774d32c9a9debee3780f783f469ca676a0327c Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Sep 2012 17:25:14 +0100 Subject: morph merge: Give consistent commit message in chunk repos Update merge test to check the message. --- tests.branching/merge.script | 8 ++++++++ tests.branching/merge.stdout | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 tests.branching/merge.stdout (limited to 'tests.branching') diff --git a/tests.branching/merge.script b/tests.branching/merge.script index 7c433519..d8a28cb3 100755 --- a/tests.branching/merge.script +++ b/tests.branching/merge.script @@ -48,3 +48,11 @@ git status --short # make sure all changes are committed # Make sure all refs to the merged branch have gone. cd ../baserock:morphs ! grep "\"ref\": \"baserock/newbranch\"" *.morph + +echo "Commit message for baserock:morphs" +git cat-file commit HEAD | tail -n 1 + +echo +echo "Commit message for baserock:hello" +cd ../baserock:hello +git cat-file commit HEAD | tail -n 1 diff --git a/tests.branching/merge.stdout b/tests.branching/merge.stdout new file mode 100644 index 00000000..e5127734 --- /dev/null +++ b/tests.branching/merge.stdout @@ -0,0 +1,5 @@ +Commit message for baserock:morphs +Merge system branch 'baserock/newbranch' + +Commit message for baserock:hello +Merge system branch 'baserock/newbranch' -- cgit v1.2.1