[PATCH] oidset: remove unnecessary include

Elijah Newren via GitGitGadget· Mar 14, 2020, 19:15 UTC · lore

From: Elijah Newren <newren@gmail.com>

When commit 8b2f8cbcb1 ("oidset: use khash", 2018-10-04) moved from using oidmap to khash, it replaced the oidmap.h include with both one for hashmap.h and khash.h. Since the hashmap.h header is unnecessary, and the point of the patch was to switch from hashmap (used by oidmap) to khash.h, remove the unneccessary include.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
    oidset: remove unnecessary include

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-727%2Fnewren%2Foidset-cleanup-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-727/newren/oidset-cleanup-v1
Pull-Request: https://github.com/git/git/pull/727

 oidset.h | 1 -
 1 file changed, 1 deletion(-)

Show changes to oidset.h +0 −1

diff --git a/oidset.h b/oidset.h
index 5346563b0bc..d8a106b1275 100644
--- a/oidset.h
+++ b/oidset.h
@@ -1,7 +1,6 @@
 #ifndef OIDSET_H
 #define OIDSET_H
 
-#include "hashmap.h"
 #include "khash.h"
 
 /**

base-commit: 30e9940356dc67959877f4b2417da33ebdefbb79

-- 
gitgitgadget

Jeff King· Mar 16, 2020, 19:28 UTC · re: Elijah Newren via GitGitGadget · lore

Re: [PATCH] oidset: remove unnecessary include

On Sat, Mar 14, 2020 at 07:15:47PM +0000, Elijah Newren via GitGitGadget wrote:

Show 7 quoted lines

> From: Elijah Newren <newren@gmail.com>
> 
> When commit 8b2f8cbcb1 ("oidset: use khash", 2018-10-04) moved from
> using oidmap to khash, it replaced the oidmap.h include with both one
> for hashmap.h and khash.h.  Since the hashmap.h header is unnecessary,
> and the point of the patch was to switch from hashmap (used by oidmap)
> to khash.h, remove the unneccessary include.

Good catch. I doubt this is causing problems, but it's obviously the right thing to do. I ran "make hdr-check" to confirm that no _other_ headers were subtly relying on this include.

-Peff

patchoidset: remove unnecessary include