[PATCH 2/2] fetch: clobber existing tags with --prune-tags

["Orgad Shaneh via GitGitGadget" <gitgitgadget@gmail.com>]

From: Orgad Shaneh <orgad.shaneh@audiocodes.com>

This was documented but not implemented.

In the flag description:
prune local tags no longer on remote *and clobber changed tags*

In the documentation:
... to prune local tags that don't exist on the remote, *and
force-update those tags that differ*.

Signed-off-by: Orgad Shaneh <orgad.shaneh@audiocodes.com>
---
 builtin/fetch.c       |  2 +-
 t/t5516-fetch-push.sh | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/builtin/fetch.c b/builtin/fetch.c
index a3bc7e9380..c212f50b86 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -981,7 +981,7 @@ static int update_local_ref(struct ref *ref,
 	    starts_with(ref->name, "refs/tags/")) {
 		struct ref_update_display_info *info;
 
-		if (force || ref->force) {
+		if (force || ref->force || prune_tags) {
 			int r;
 
 			r = s_update_ref("updating tag", ref, transaction, 0);
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 31df7faf56..4d29043baf 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1092,7 +1092,7 @@ test_force_fetch_tag () {
 	tag_type_description=$1
 	tag_args=$2
 
-	test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
+	test_expect_success "fetch will not clobber an existing $tag_type_description without --force or --prune-tags" "
 		mk_test testrepo heads/main &&
 		mk_child testrepo child1 &&
 		mk_child testrepo child2 &&
@@ -1108,7 +1108,13 @@ test_force_fetch_tag () {
 			git -C ../child1 fetch origin '+refs/tags/*:refs/tags/*' &&
 			git tag $tag_args testTag HEAD^ &&
 			test_must_fail git -C ../child1 fetch origin tag testTag &&
-			git -C ../child1 fetch --force origin tag testTag
+			git -C ../child1 fetch --force origin tag testTag &&
+			git tag $tag_args testTag HEAD &&
+			test_must_fail git -C ../child1 fetch origin tag testTag &&
+			git -C ../child1 fetch --prune-tags origin tag testTag &&
+			git tag $tag_args testTag HEAD^ &&
+			test_must_fail git -C ../child1 fetch origin tag testTag &&
+			git -C ../child1 -c fetch.prunetags=true fetch origin tag testTag
 		)
 	"
 }
-- 
gitgitgadget