From ea9511acfcb3df887da5f64ed8e03e787ae21879 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 23 Sep 2024 13:10:36 +0200 Subject: [PATCH] pull: Make sure the pull-tag is never signed .. so git doesn't prompt for a tag message --- lib/commands/pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/commands/pull.sh b/lib/commands/pull.sh index c6610b1..cc3b138 100644 --- a/lib/commands/pull.sh +++ b/lib/commands/pull.sh @@ -19,7 +19,7 @@ pull() { (cd "$repo" && git rev-parse --verify "refs/tags/$BEFORE_PULL_TAG" &>/dev/null) && \ err "$EX_DATAERR" "Pull marker tag ($BEFORE_PULL_TAG) already exists in $repo. Please resolve this before pulling." # make a tag at the current commit, so we can compare against it below - (cd "$repo" && git tag "$BEFORE_PULL_TAG" 2>&1) + (cd "$repo" && git tag --no-sign "$BEFORE_PULL_TAG" 2>&1) # remove the tag if one of the git operations fails trap 'cd "$repo" && git tag -d "$BEFORE_PULL_TAG" &>/dev/null' EXIT