From 6a47d2874328c4ec70dc36a572c31d20b3aab0b3 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 6 Sep 2017 03:36:28 -0400 Subject: Move merge pointer cleanup into systr_merge_finish This is to not break things if the user leaves interactive resolution and has to use systrunk apply-merge. --- merge.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'merge.sh') diff --git a/merge.sh b/merge.sh index 071ddca..48f907b 100644 --- a/merge.sh +++ b/merge.sh @@ -59,6 +59,7 @@ function systr_merge_finish exit 1 fi + branch="$1" commit=$(systr_repo_resolve_reference "$1") mergebase=$(systr_repo_merge_base "$commit" "$BASE") @@ -73,6 +74,11 @@ function systr_merge_finish rsync -azi .systr/merge/ . rm -rf .systr/merge/ .systr/tmp/ + + if [[ "$branch" == "TRAC" ]]; then + echo "NULL" >.systr/MERG + echo "$commit" >.systr/BASE + fi } ## @@ -158,10 +164,6 @@ function systr_merge # apply merge # systr_merge_finish "$commit" - - if [[ "$commit" == "TRAC" ]]; then - echo "NULL" >.systr/MERG - fi } ## -- cgit v1.2.3