diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-09-13 10:02:28 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-09-13 10:02:28 +0000 |
| commit | 2a38d6b1a1702c1de0e684714d1056049f546515 (patch) | |
| tree | 30805cc621adc2dbc59cedd7600fe1c6df4af71e /tests.branching | |
| parent | 95d1a8a4a0fce4b8d247ff5ee6f3df6e21a4e983 (diff) | |
| parent | 8c774d32c9a9debee3780f783f469ca676a0327c (diff) | |
| download | morph-2a38d6b1a1702c1de0e684714d1056049f546515.tar.gz | |
Merge branch 'samthursfield/S4713-merge-message-for-chunks' of git://roadtrain.codethink.co.uk/baserock/morph
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/merge.script | 8 | ||||
| -rw-r--r-- | tests.branching/merge.stdout | 5 |
2 files changed, 13 insertions, 0 deletions
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' |