diff options
| author | Malf Furious <m@lfurio.us> | 2017-09-06 16:41:22 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2017-09-06 16:41:22 -0400 |
| commit | 7192615541e6f242d2414a12115e54de54b020b1 (patch) | |
| tree | ed5b25bf80aa61f8489748a5f5d099c0eb8c1719 | |
| parent | d8e9ca30edd02b0c6809cd856db5caf086a4b788 (diff) | |
| download | systrunk-7192615541e6f242d2414a12115e54de54b020b1.tar.gz systrunk-7192615541e6f242d2414a12115e54de54b020b1.zip | |
Integrate merge and commit ops
Setup for prebaked commit message and merge-commit meta-data.
| -rw-r--r-- | commit.sh | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -79,7 +79,13 @@ function systr_commit fi commit=$(systr_repo_create_commit) - systr_record_commit_mesg "$commit" "$branch" + + if [[ "$MERG" == "NULL" ]]; then + systr_record_commit_mesg "$commit" "$branch" + else + systr_record_commit_mesg "$commit" "$branch" "Merge $MERG into $TRAC" + fi + echo "Sending files..." if [[ "$branchcommit" != "NULL" ]]; then @@ -88,7 +94,13 @@ function systr_commit systr_rsync_normal . "$path/revs/$commit/" fi - systr_repo_finish_commit "$commit" "$branchcommit" + if [[ "$MERG" == "NULL" ]]; then + systr_repo_finish_commit "$commit" "$branchcommit" + else + mergecommit=$(systr_repo_resolve_reference "$MERG") + systr_repo_finish_commit "$commit" "$branchcommit" "$mergecommit" + fi + echo "$commit" >.systr/BASE echo "NULL" >.systr/MERG date >.systr/updated |