From bc1c678cb394a4db56bd331c261458a4cdc3fa21 Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Sat, 8 Feb 2020 08:50:30 +0000
Subject: kiss: Don't git pull. Closes #141

FossilOrigin-Name: 06d59b778be4472366936352288c9aa2c6d7907a1e3ca1e5372231fc57e00c72
---
 kiss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kiss b/kiss
index 0685909..894076b 100755
--- a/kiss
+++ b/kiss
@@ -1075,7 +1075,8 @@ pkg_updates() {
             esac
 
             if [ -w "$PWD" ] && [ "$(id -u)" != 0 ]; then
-                git pull
+                git fetch
+                git merge
 
             else
                 log "$PWD" "Need root to update"
@@ -1092,7 +1093,8 @@ pkg_updates() {
                     [ "$user" = root ] ||
                         log "Dropping permissions to $user for pull"
 
-                    as_root git pull
+                    as_root git fetch
+                    as_root git merge
                 )
             fi
         }
@@ -1278,7 +1280,7 @@ args() {
         l|list)    pkg_list "$@" ;;
         u|update)  pkg_updates ;;
         s|search)  for pkg; do pkg_find "$pkg" all; done ;;
-        v|version) log kiss 1.3.0 ;;
+        v|version) log kiss 1.3.1 ;;
 
         h|help|-h|--help|'')
             log 'kiss [a|b|c|i|l|r|s|u|v] [pkg] [pkg] [pkg]'
-- 
cgit v1.2.3