From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Mar 2023 20:47:11 +0000 (-0700)
Subject: Merge branch 'sg/parse-options-h-users'
X-Git-Tag: v2.41.0-rc0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbb4102f7b1fea1f7e55450951d5692a4bc937d3;p=thirdparty%2Fgit.git

Merge branch 'sg/parse-options-h-users'

Code clean-up to include and/or uninclude parse-options.h file as
needed.

* sg/parse-options-h-users:
  treewide: remove unnecessary inclusions of parse-options.h from headers
  treewide: include parse-options.h in source files
---

dbb4102f7b1fea1f7e55450951d5692a4bc937d3
diff --cc list-objects-filter-options.h
index ef03b45132,aad295f232..727c986122
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@@ -1,11 -1,11 +1,12 @@@
  #ifndef LIST_OBJECTS_FILTER_OPTIONS_H
  #define LIST_OBJECTS_FILTER_OPTIONS_H
  
 -#include "cache.h"
 +#include "object.h"
- #include "parse-options.h"
  #include "string-list.h"
 +#include "strbuf.h"
  
+ struct option;
+ 
  /*
   * The list of defined filters for list-objects.
   */
diff --cc remote.h
index 5b38ee20b8,92eccf22ec..73638cefeb
--- a/remote.h
+++ b/remote.h
@@@ -1,7 -1,7 +1,6 @@@
  #ifndef REMOTE_H
  #define REMOTE_H
  
- #include "parse-options.h"
 -#include "cache.h"
  #include "hashmap.h"
  #include "refspec.h"