From 6eb5c49964d0c5d4bbaa4391112db1ee0e5a15c2 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 27 Aug 2017 20:51:29 -0400 Subject: Update status command Brought forward the status command... now using resolve_reference function instead of the old 'get_commit'. Added this file to the make script. --- status.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'status.sh') diff --git a/status.sh b/status.sh index 893dde2..6b99eb5 100644 --- a/status.sh +++ b/status.sh @@ -15,7 +15,7 @@ function systr_status if [ -f ".systr/MERG" ]; then read MERG <.systr/MERG - mergcommit=$(get_commit "$MERG") + mergcommit=$(systr_repo_resolve_reference "$MERG") if [[ "$MERG" == "TRAC" ]]; then echo "Update in progress, to $mergcommit" @@ -26,7 +26,7 @@ function systr_status echo "" fi - traccommit=$(get_commit "$TRAC") + traccommit=$(systr_repo_resolve_reference "$TRAC") if [[ "$TRAC" == "$traccommit" ]]; then echo "Not tracking any branch" -- cgit v1.2.3