From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Jan 2021 23:20:29 +0000 (-0800)
Subject: Merge branch 'ma/sha1-is-a-hash'
X-Git-Tag: v2.31.0-rc0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b327f1784d21c52bc177b5ca75665db388d6367;p=thirdparty%2Fgit.git

Merge branch 'ma/sha1-is-a-hash'

Retire more names with "sha1" in it.

* ma/sha1-is-a-hash:
  hash-lookup: rename from sha1-lookup
  sha1-lookup: rename `sha1_pos()` as `hash_pos()`
  object-file.c: rename from sha1-file.c
  object-name.c: rename from sha1-name.c
---

8b327f1784d21c52bc177b5ca75665db388d6367
diff --cc pack-bitmap-write.c
index cc5ead9990,ae6d1475f9..92460a6126
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@@ -9,10 -9,9 +9,10 @@@
  #include "pack-revindex.h"
  #include "pack.h"
  #include "pack-bitmap.h"
- #include "sha1-lookup.h"
+ #include "hash-lookup.h"
  #include "pack-objects.h"
  #include "commit-reach.h"
 +#include "prio-queue.h"
  
  struct bitmapped_commit {
  	struct commit *commit;