diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-13 13:25:44 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-14 19:45:01 +0100 |
| commit | f7e02d76ec22bda2a0dfcd24f44a4df8544fae02 (patch) | |
| tree | 23ae6933053f3917346976f878a317f749b939b7 /tests.branching | |
| parent | 3911c0bea5654a4de7cd9121d89c7f9bc69b0172 (diff) | |
| download | morph-f7e02d76ec22bda2a0dfcd24f44a4df8544fae02.tar.gz | |
morph merge: Don't make a merge commit if only the refs changed
'git commit' fails if there are no changes in any case.
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/merge.script | 2 | ||||
| -rw-r--r-- | tests.branching/merge.stdout | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests.branching/merge.script b/tests.branching/merge.script index d8a28cb3..21a30116 100755 --- a/tests.branching/merge.script +++ b/tests.branching/merge.script @@ -49,6 +49,8 @@ git status --short # make sure all changes are committed cd ../baserock:morphs ! grep "\"ref\": \"baserock/newbranch\"" *.morph +# The only change here was the branch refs, which have now been +# changed back - so there should not be any new commits. echo "Commit message for baserock:morphs" git cat-file commit HEAD | tail -n 1 diff --git a/tests.branching/merge.stdout b/tests.branching/merge.stdout index e5127734..6806f75a 100644 --- a/tests.branching/merge.stdout +++ b/tests.branching/merge.stdout @@ -1,5 +1,5 @@ Commit message for baserock:morphs -Merge system branch 'baserock/newbranch' +initial Commit message for baserock:hello Merge system branch 'baserock/newbranch' |