fetch: stop clobbering existing tags without --force

diff --git a/apply.h b/apply.h
index cf00cda171cf42cef1164916c973e2e339f41b54..b80d8ba73633c042989e52a00f7df8ee3afcd192 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -36,9 +36,8 @@ enum apply_verbosity {
 struct apply_state {
        const char *prefix;
 
-       /* These are lock_file related */
+       /* Lock file */
        struct lock_file lock_file;
-       int newfd;
 
        /* These control what gets looked at and modified */
        int apply; /* this is not a dry-run */
@@ -46,6 +45,7 @@ struct apply_state {
        int check; /* preimage must match working tree, don't actually apply */
        int check_index; /* preimage must match the indexed version */
        int update_index; /* check_index && apply */
+       int ita_only;     /* add intent-to-add entries to the index */
 
        /* These control cosmetic aspect of the output */
        int diffstat; /* just show a diffstat, and don't actually apply */