From a519df3a425e1bb6e4079b660d074d8fe8679d5d Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Sep 2023 16:16:42 -0700
Subject: [PATCH] Revert "trailer: rename *_DEFAULT enums to *_UNSPECIFIED"

This reverts commit d2be104085b24867e3dd9cb061c75b456071b351, which
was premature.  It will be replaced with an updated patch.
---
 trailer.c | 17 +++++++----------
 trailer.h |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/trailer.c b/trailer.c
index 6ad2fbca94..f646e484a2 100644
--- a/trailer.c
+++ b/trailer.c
@@ -388,7 +388,7 @@ static void process_trailers_lists(struct list_head *head,
 int trailer_set_where(enum trailer_where *item, const char *value)
 {
 	if (!value)
-		*item = WHERE_UNSPECIFIED;
+		*item = WHERE_DEFAULT;
 	else if (!strcasecmp("after", value))
 		*item = WHERE_AFTER;
 	else if (!strcasecmp("before", value))
@@ -405,7 +405,7 @@ int trailer_set_where(enum trailer_where *item, const char *value)
 int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
 {
 	if (!value)
-		*item = EXISTS_UNSPECIFIED;
+		*item = EXISTS_DEFAULT;
 	else if (!strcasecmp("addIfDifferent", value))
 		*item = EXISTS_ADD_IF_DIFFERENT;
 	else if (!strcasecmp("addIfDifferentNeighbor", value))
@@ -424,7 +424,7 @@ int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
 int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
 {
 	if (!value)
-		*item = MISSING_UNSPECIFIED;
+		*item = MISSING_DEFAULT;
 	else if (!strcasecmp("doNothing", value))
 		*item = MISSING_DO_NOTHING;
 	else if (!strcasecmp("add", value))
@@ -586,10 +586,7 @@ static void ensure_configured(void)
 	if (configured)
 		return;
 
-	/*
-	 * Default config must be setup first. These defaults are used if there
-	 * are no "trailer.*" or "trailer.<token>.*" options configured.
-	 */
+	/* Default config must be setup first */
 	default_conf_info.where = WHERE_END;
 	default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
 	default_conf_info.if_missing = MISSING_ADD;
@@ -704,11 +701,11 @@ static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
 	new_item->value = val;
 	duplicate_conf(&new_item->conf, conf);
 	if (new_trailer_item) {
-		if (new_trailer_item->where != WHERE_UNSPECIFIED)
+		if (new_trailer_item->where != WHERE_DEFAULT)
 			new_item->conf.where = new_trailer_item->where;
-		if (new_trailer_item->if_exists != EXISTS_UNSPECIFIED)
+		if (new_trailer_item->if_exists != EXISTS_DEFAULT)
 			new_item->conf.if_exists = new_trailer_item->if_exists;
-		if (new_trailer_item->if_missing != MISSING_UNSPECIFIED)
+		if (new_trailer_item->if_missing != MISSING_DEFAULT)
 			new_item->conf.if_missing = new_trailer_item->if_missing;
 	}
 	list_add_tail(&new_item->list, arg_head);
diff --git a/trailer.h b/trailer.h
index a689d768c7..ab2cd01756 100644
--- a/trailer.h
+++ b/trailer.h
@@ -5,14 +5,14 @@
 #include "strbuf.h"
 
 enum trailer_where {
-	WHERE_UNSPECIFIED,
+	WHERE_DEFAULT,
 	WHERE_END,
 	WHERE_AFTER,
 	WHERE_BEFORE,
 	WHERE_START
 };
 enum trailer_if_exists {
-	EXISTS_UNSPECIFIED,
+	EXISTS_DEFAULT,
 	EXISTS_ADD_IF_DIFFERENT_NEIGHBOR,
 	EXISTS_ADD_IF_DIFFERENT,
 	EXISTS_ADD,
@@ -20,7 +20,7 @@ enum trailer_if_exists {
 	EXISTS_DO_NOTHING
 };
 enum trailer_if_missing {
-	MISSING_UNSPECIFIED,
+	MISSING_DEFAULT,
 	MISSING_ADD,
 	MISSING_DO_NOTHING
 };