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
This commit is contained in:
@ -9,7 +9,7 @@
|
||||
#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"
|
||||
@ -626,7 +626,7 @@ static void write_selected_commits_v1(struct hashfile *f,
|
||||
struct bitmapped_commit *stored = &writer.selected[i];
|
||||
|
||||
int commit_pos =
|
||||
sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
|
||||
hash_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
|
||||
|
||||
if (commit_pos < 0)
|
||||
BUG("trying to write commit not in index");
|
||||
|
Reference in New Issue
Block a user