test-lib-functions: assert correct parameter count

[thirdparty/git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index 3e51fdfe589ce67c5a745845907e15909f4ed905..d6928c1b5c1a84980e403c805d2e5fcd072e40aa 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -10,7 +10,7 @@
 #include "attr.h"
 #include "pathspec.h"
 #include "object-store.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 
 #define RESOLVED 0
 #define PUNTED 1
@@ -147,7 +147,7 @@ static struct rerere_dir *find_rerere_dir(const char *hex)
 
        if (get_sha1_hex(hex, hash))
                return NULL; /* BUG */
-       pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
+       pos = hash_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
        if (pos < 0) {
                rr_dir = xmalloc(sizeof(*rr_dir));
                hashcpy(rr_dir->hash, hash);
@@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
  * and NUL concatenated together.
  *
  * Return 1 if conflict hunks are found, 0 if there are no conflict
- * hunks and -1 if an error occured.
+ * hunks and -1 if an error occurred.
  */
 static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size)
 {