From 66e981f81aa70d8d7d0bcb72a3d58fc98cc7b480 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 16 Jan 2020 23:45:12 +0200
Subject: [PATCH 1/4] kiss: Git support

---
 kiss | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/kiss b/kiss
index 287c48e..012603a 100755
--- a/kiss
+++ b/kiss
@@ -140,11 +140,23 @@ pkg_sources() {
 
     repo_dir=$(pkg_find "$1")
 
-    while read -r src _ || [ "$src" ]; do
+    while read -r src dest || [ "$src" ]; do
         # Remote source (cached).
         if [ -f "${src##*/}" ]; then
             log "$1" "Found cached source '${src##*/}'"
 
+        # Remote git repository.
+        elif [ -z "${src##git+*}" ]; then
+            # This is a checksums check, skip it.
+            [ "$2" ] && continue
+
+            repo_src=${src##git+}
+
+            mkdir -p "$mak_dir/$1/$dest"
+
+            (cd "$mak_dir/$1/$dest" && git clone "${repo_src%#*}" .) ||
+                die "$1" "Failed to clone $src"
+
         # Remote source.
         elif [ -z "${src##*://*}" ]; then
             curl "$src" -fLo "${src##*/}" || {
@@ -173,6 +185,17 @@ pkg_extract() {
         mkdir -p "$mak_dir/$1/$dest" && cd "$mak_dir/$1/$dest"
 
         case $src in
+            # Git repository with supplied commit hash.
+            git+*\#*)
+                git reset --hard "${src##*#}" ||
+                    die "Commit hash ${src##*#} doesn't exist"
+            ;;
+
+            # Git repository.
+            git+*)
+                continue
+            ;;
+
             # Only 'tar' archives are currently supported for extraction.
             # Any other file-types are simply copied to '$mak_dir' which
             # allows for manual extraction.
@@ -566,6 +589,10 @@ pkg_checksums() {
         elif [ -f "$src_dir/$1/${src##*/}" ]; then
             src_path=$src_dir/$1
 
+        # File is a git repository, skip checksums.
+        elif [ -z "${src##git+*}" ]; then
+            continue
+
         # Die here if source for some reason, doesn't exist.
         else
             die "$1" "Couldn't find source '$src'"
@@ -997,7 +1024,7 @@ args() {
 
         c|checksum)
             for pkg; do pkg_lint    "$pkg"; done
-            for pkg; do pkg_sources "$pkg"; done
+            for pkg; do pkg_sources "$pkg" c; done
             for pkg; do
                 pkg_checksums "$pkg" > "$(pkg_find "$pkg")/checksums"
 

From 632d3cf72161707a61f2a0235687e94bd556f50e Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 16 Jan 2020 23:48:19 +0200
Subject: [PATCH 2/4] kiss: Add message on checkout

---
 kiss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kiss b/kiss
index 012603a..47c676f 100755
--- a/kiss
+++ b/kiss
@@ -187,6 +187,8 @@ pkg_extract() {
         case $src in
             # Git repository with supplied commit hash.
             git+*\#*)
+                log "Checking out ${src##*#}"
+
                 git reset --hard "${src##*#}" ||
                     die "Commit hash ${src##*#} doesn't exist"
             ;;

From 445ba5ead55e90d785e601299e31f5fd40bcdd8f Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 17 Jan 2020 01:00:26 +0200
Subject: [PATCH 3/4] kiss: Do a shallow clone unless checking out a hash

---
 kiss | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kiss b/kiss
index 47c676f..aa7cfb8 100755
--- a/kiss
+++ b/kiss
@@ -150,12 +150,18 @@ pkg_sources() {
             # This is a checksums check, skip it.
             [ "$2" ] && continue
 
-            repo_src=${src##git+}
-
             mkdir -p "$mak_dir/$1/$dest"
 
-            (cd "$mak_dir/$1/$dest" && git clone "${repo_src%#*}" .) ||
-                die "$1" "Failed to clone $src"
+            # Run in a subshell to keep variables local.
+            (
+                repo_src=${src##git+}
+
+                [ "${src##*#*}" ] && shallow=--depth=1
+
+                cd "$mak_dir/$1/$dest" &&
+                    git clone "${shallow:---}" "${repo_src%#*}" .
+
+            ) || die "$1" "Failed to clone $src"
 
         # Remote source.
         elif [ -z "${src##*://*}" ]; then

From f54608ee3eb3133bbcc12d1ad0bf2f3d31f68d14 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 18 Jan 2020 10:59:40 +0200
Subject: [PATCH 4/4] kiss: Fix checksums issues

---
 kiss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kiss b/kiss
index aa7cfb8..956293a 100755
--- a/kiss
+++ b/kiss
@@ -597,8 +597,9 @@ pkg_checksums() {
         elif [ -f "$src_dir/$1/${src##*/}" ]; then
             src_path=$src_dir/$1
 
-        # File is a git repository, skip checksums.
+        # File is a git repository.
         elif [ -z "${src##git+*}" ]; then
+            printf '%-64s  %s\n' git "${src##*/}"
             continue
 
         # Die here if source for some reason, doesn't exist.