diff options
author | Malf Furious <m@lfurio.us> | 2017-08-27 20:51:29 -0400 |
---|---|---|
committer | Malf Furious <m@lfurio.us> | 2017-08-27 20:51:29 -0400 |
commit | 6eb5c49964d0c5d4bbaa4391112db1ee0e5a15c2 (patch) | |
tree | 4d0f024018b2ce0d752154aea52cfa02024e1c3e | |
parent | 547984a91aec8b9aa12acc60146e0f23810034b0 (diff) | |
download | systrunk-6eb5c49964d0c5d4bbaa4391112db1ee0e5a15c2.tar.gz systrunk-6eb5c49964d0c5d4bbaa4391112db1ee0e5a15c2.zip |
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.
-rwxr-xr-x | make.sh | 2 | ||||
-rw-r--r-- | status.sh | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ #!/usr/bin/bash echo "#!/usr/bin/bash -e" >systrunk -cat rsync.sh repo-access.sh repo-mutate.sh checkout.sh main.sh >>systrunk +cat rsync.sh repo-access.sh repo-mutate.sh checkout.sh status.sh main.sh >>systrunk chmod +x systrunk @@ -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" |