From 3f625d08dbc7c73f544c743d8f89bb426eb7cb22 Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Tue, 2 Jul 2024 08:33:21 -0300 Subject: [PATCH] Add gitdiff --- libexec/portzap/commands/portzap-clone | 1 - libexec/portzap/utils/git-changed-files | 10 ++++------ libexec/portzap/utils/git-removed-files | 6 +++--- libexec/portzap/utils/gitdiff | 11 +++++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 libexec/portzap/utils/gitdiff diff --git a/libexec/portzap/commands/portzap-clone b/libexec/portzap/commands/portzap-clone index 1cc3e64..222ef5f 100755 --- a/libexec/portzap/commands/portzap-clone +++ b/libexec/portzap/commands/portzap-clone @@ -45,7 +45,6 @@ set -x gitexec "clone ${giturl} ${gitdir}" cd "${gitdir}" gitexec "config core.filemode off" -gitexec "config diff.renameList 7000" set +x set +e gitexec "checkout -t origin/${branch} > /dev/null 2>&1" diff --git a/libexec/portzap/utils/git-changed-files b/libexec/portzap/utils/git-changed-files index 5ad2991..8d1fcf7 100644 --- a/libexec/portzap/utils/git-changed-files +++ b/libexec/portzap/utils/git-changed-files @@ -10,15 +10,13 @@ commit=$2 ## # functions -gitexec() +diff() { - "${libexec}"/utils/gitexec "${1}" + "${libexec}"/utils/gitdiff ${@} } ## # main cd "${gitdir}" -add=$(gitexec "diff --name-only --diff-filter=A ${commit} HEAD") -mod=$(gitexec "diff --name-only --diff-filter=M ${commit} HEAD") -echo "${add}" -echo "${mod}" +diff "--name-only" "--diff-filter=A" "${commit}" "HEAD" +diff "--name-only" "--diff-filter=M" "${commit}" "HEAD" diff --git a/libexec/portzap/utils/git-removed-files b/libexec/portzap/utils/git-removed-files index 44cbdeb..158f73b 100644 --- a/libexec/portzap/utils/git-removed-files +++ b/libexec/portzap/utils/git-removed-files @@ -10,12 +10,12 @@ commit=$2 ## # functions -gitexec() +diff() { - "${libexec}"/utils/gitexec "${1}" + "${libexec}"/utils/gitdiff ${@} } ## # main cd "${gitdir}" -gitexec "diff --name-only --diff-filter=D ${commit} HEAD" +diff "--name-only" "--diff-filter=D" "${commit}" "HEAD" diff --git a/libexec/portzap/utils/gitdiff b/libexec/portzap/utils/gitdiff new file mode 100644 index 0000000..afb2a29 --- /dev/null +++ b/libexec/portzap/utils/gitdiff @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +## +# variables +localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} +libexec="${localbase}"/libexec/portzap + +## +# main +"${libexec}"/utils/gitexec diff -l0 ${@}