Sigh and switch to git tree-hash due to needing .gitignore handling.

This commit is contained in:
Lance Vick 2023-03-29 09:36:39 -07:00
parent c6d3a512e4
commit 20e73c7cec
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 10 additions and 16 deletions

26
sig
View File

@ -209,19 +209,7 @@ group_check_fp(){
tree_hash() { tree_hash() {
local -r ref="${1:-HEAD}" local -r ref="${1:-HEAD}"
local -r target=$(git rev-parse "$ref") git rev-parse "${ref}^{tree}"
local -r current=$(git rev-parse HEAD)
[ "$target" == "$current" ] || git checkout "$target" >/dev/null 2>&1
mkdir -p ".${PROGRAM}"
printf "%s" "$( \
find . -type f -not -path "./.git/*" \
-exec openssl sha256 -r {} \;\
)" \
| sed -e 's/ \*/ /g' -e 's/ \.\// /g' \
| LC_ALL=C sort -k2 \
| openssl sha256 -r \
| sed -e 's/ .*//g'
[ "$target" == "$current" ] || git checkout "$current" >/dev/null 2>&1
} }
sig_generate(){ sig_generate(){
@ -387,7 +375,7 @@ verify(){
echo "Error: $error"; echo "Error: $error";
return 1; return 1;
} }
echo "Verified signed git note commit by \"${uid}\"" echo "Verified signed git note by \"${uid}\""
if [[ "${seen_fps}" != *"${fp}"* ]]; then if [[ "${seen_fps}" != *"${fp}"* ]]; then
seen_fps+=" ${fp}" seen_fps+=" ${fp}"
fi fi
@ -461,9 +449,12 @@ sign_note() {
[[ "$push" -eq "0" ]] || $PROGRAM push [[ "$push" -eq "0" ]] || $PROGRAM push
} }
## Public Commands ## Public Commands
cmd_remove() {
git notes --ref signatures remove
}
cmd_verify() { cmd_verify() {
local opts threshold=1 group="" method="" diff="" local opts threshold=1 group="" method="" diff=""
opts="$(getopt -o t:g:m:d:: -l threshold:,group:,ref:,diff:: -n "$PROGRAM" -- "$@")" opts="$(getopt -o t:g:m:d:: -l threshold:,group:,ref:,diff:: -n "$PROGRAM" -- "$@")"
@ -580,6 +571,8 @@ cmd_usage() {
Usage: Usage:
$PROGRAM add [-m,--method=<note|tag>] [-p,--push] $PROGRAM add [-m,--method=<note|tag>] [-p,--push]
Add signature for this repository Add signature for this repository
$PROGRAM remove
Remove all signatures on current ref
$PROGRAM verify [-g,--group=<group>] [-t,--threshold=<N>] [d,--diff=<branch>] $PROGRAM verify [-g,--group=<group>] [-t,--threshold=<N>] [d,--diff=<branch>]
Verify m-of-n signatures by given group are present for directory. Verify m-of-n signatures by given group are present for directory.
$PROGRAM fetch [-g,--group=<group>] $PROGRAM fetch [-g,--group=<group>]
@ -601,8 +594,9 @@ readonly PROGRAM="${0##*/}"
case "$1" in case "$1" in
verify) shift; cmd_verify "$@" ;; verify) shift; cmd_verify "$@" ;;
add) shift; cmd_add "$@" ;; add) shift; cmd_add "$@" ;;
remove) shift; cmd_remove "$@" ;;
fetch) shift; cmd_fetch "$@" ;; fetch) shift; cmd_fetch "$@" ;;
push) shift; cmd_push "$@" ;; push) shift; cmd_push "$@" ;;
version|--version) shift; cmd_version "$@" ;; version|--version) shift; cmd_version "$@" ;;
help|--help) shift; cmd_usage "$@" ;; help|--help) shift; cmd_usage "$@" ;;
*) cmd_usage "$@" ;; *) cmd_usage "$@" ;;