From 7192615541e6f242d2414a12115e54de54b020b1 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Wed, 6 Sep 2017 16:41:22 -0400
Subject: Integrate merge and commit ops

Setup for prebaked commit message and merge-commit meta-data.
---
 commit.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/commit.sh b/commit.sh
index 2c5e6fd..f2cf7f3 100644
--- a/commit.sh
+++ b/commit.sh
@@ -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
-- 
cgit v1.2.3