From: Shane Jaroch Date: Wed, 14 Jan 2026 19:49:53 +0000 (-0500) Subject: lint X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=2a04a04c4469c70be6c5cd1fe6d22292d00ff966;p=gamesguru%2Fgit-remote-gcrypt.git lint --- diff --git a/Makefile b/Makefile index 1bb405e..f060776 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ test/: ##H Run tests (purity checks only if kcov missing) @if command -v kcov >/dev/null 2>&1; then \ $(MAKE) test/installer test/system test/cov; \ else \ - printf "\033[1;33mkcov not found: skipping coverage/bash tests.\033[0m\n"; \ + $(call print_warn,kcov not found: skipping coverage/bash tests.); \ $(MAKE) test/purity; \ fi diff --git a/TODO.rst b/TODO.rst deleted file mode 100644 index d1afd10..0000000 --- a/TODO.rst +++ /dev/null @@ -1,37 +0,0 @@ - -Saturday, 1/10/26 - -Q: Does the manifest... (contain? ) - -~~~~~~~~~~~~~~~~~~~~~~ - -The issue here is the second one is a valid, encrypted remote. -The tool is doing too much work and providing dumb results, at times, by trying to be fancy and smart. - -.. code-block:: shell - - shane@coffeelake:~/repos/git-remote-gcrypt$ cd - - /home/shane - direnv: loading ~/.envrc - direnv: export +RIPGREP_CONFIG_PATH +VIRTUAL_ENV +VIRTUAL_ENV_PROMPT ~PATH - shane@coffeelake:~$ git remote update - Fetching github - gcrypt: git-remote-gcrypt version 1.5-10-ge258c9e (deb running on arch) - gcrypt: ERROR: Remote repository contains unencrypted or unknown files! - gcrypt: To protect your privacy, git-remote-gcrypt will NOT push to this remote. - gcrypt: Found unexpected files: .bash_aliases .bash_exports .bash_history.coffeelake - gcrypt: To see unencrypted files, use: git-remote-gcrypt clean git@github.com:gamesguru/shane.git - gcrypt: To fix and remove these files, use: git-remote-gcrypt clean --force git@github.com:gamesguru/shane.git - error: could not fetch github - - # This shouldn't warn, it's a valid encrypted remote! - Fetching origin - gcrypt: git-remote-gcrypt version 1.5-10-ge258c9e (deb running on arch) - gcrypt: ERROR: Remote repository is not empty! - gcrypt: To protect your privacy, git-remote-gcrypt will NOT push to this remote - gcrypt: unless you force it or clean it. - gcrypt: Found files: 91bd0c092128cf2e60e1a608c31e92caf1f9c1595f83f2890ef17c0e4881aa0a b5cb4d58020a8b6376ce627e3c4d2404a1e5bb772bd20eecedbe3ff9212d9aae ... - gcrypt: To see files: git-remote-gcrypt clean rsync://git@dev:repos/home.shane.git - gcrypt: To init anyway (DANGEROUS if not empty): git push --force ... - gcrypt: OR set gcrypt.allow-unencrypted-remote to true. - error: could not fetch origin diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 05b6643..4a9213c 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -1414,7 +1414,10 @@ get_remote_file_list() # Try fetching master and main to a temporary ref. if git fetch --quiet "$URL" "refs/heads/master:refs/gcrypt/list-files" 2>/dev/null || \ git fetch --quiet "$URL" "refs/heads/main:refs/gcrypt/list-files" 2>/dev/null; then - r_files=$(git ls-tree -r --name-only "refs/gcrypt/list-files") || return 1 + r_files=$(git ls-tree -r --name-only "refs/gcrypt/list-files") || { + git update-ref -d "refs/gcrypt/list-files" + return 1 + } git update-ref -d "refs/gcrypt/list-files" else # Could not fetch, or remote is empty. diff --git a/tests/test_rsync_simple.sh b/tests/test_rsync_simple.sh index c6e1d34..eeafc32 100644 --- a/tests/test_rsync_simple.sh +++ b/tests/test_rsync_simple.sh @@ -28,12 +28,14 @@ EOF echo "Checking results..." if [ -e .tmp/simple_dst/subdir/badfile ]; then echo "FAIL: badfile NOT removed" + exit 1 else echo "SUCCESS: badfile removed" fi if [ ! -e .tmp/simple_dst/subdir/goodfile ]; then echo "FAIL: goodfile was INCORRECTLY removed" + exit 1 else echo "SUCCESS: goodfile preserved" fi diff --git a/utils/gen_docs.sh b/utils/gen_docs.sh index eab2ba7..b95bbaf 100755 --- a/utils/gen_docs.sh +++ b/utils/gen_docs.sh @@ -73,7 +73,7 @@ unset IFS # 3. Generate README echo "Generating $README_OUT..." -sed "s/{commands_help}/$(echo "$COMMANDS_HELP" | sed 's/[\/&]/\\&/g' | awk '{printf "%s\\n", $0}')/" "$README_TMPL" >"$README_OUT" +sed "s/{commands_help}/$(echo "$COMMANDS_HELP" | sed 's/[\/&]/\\&/g' | awk 'NR>1{printf "\\n"} {printf "%s", $0}')/" "$README_TMPL" >"$README_OUT" # 4. Generate Bash echo "Generating Bash completions..."