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

diff --cc commit.c
Simple merge

diff --cc pack-bitmap-write.c
index cc5ead999000fea987790b8870a6a597ac6c3de5,ae6d1475f9ee8f06575b2517f3eb2c39117e84f1..92460a61262822e2a8412fc3e1f1acd4007b824a
--- 1/pack-bitmap-write.c
--- 2/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;