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

diff --cc builtin/ls-remote.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/receive-pack.c
Simple merge

diff --cc builtin/send-pack.c
Simple merge

diff --cc diagnose.c
Simple merge

diff --cc list-objects-filter-options.c
Simple merge

diff --cc list-objects-filter-options.h
index ef03b45132e87ae1f1951e86c5d38084c4467b76,aad295f2327996b82f4b568d42cb88a3aa278cba..727c986122fc710b72bc827f1a18cb05b2fb0622
--- 1/list-objects-filter-options.h
--- 2/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.c
Simple merge

diff --cc remote.h
index 5b38ee20b843bbb90655677c28132a9523411bd0,92eccf22ec985183522119fb5602a95103c9c480..73638cefeb102d6dd9a6777645156a2034594240
--- 1/remote.h
--- 2/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"
  

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge

diff --cc send-pack.c
Simple merge