Merge pull request #2829 from jacquesg/dead-code Remove logically dead code (we're already asserting)
diff --git a/src/pool.c b/src/pool.c
index a5dfa0f..7350c04 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -225,7 +225,7 @@ char *git_pool_strcat(git_pool *pool, const char *a, const char *b)
void *ptr;
size_t len_a, len_b;
- assert(pool && a && b && pool->item_size == sizeof(char));
+ assert(pool && pool->item_size == sizeof(char));
len_a = a ? strlen(a) : 0;
len_b = b ? strlen(b) : 0;
diff --git a/src/repository.c b/src/repository.c
index 0cf8eb6..f49a251 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -1836,7 +1836,7 @@ int git_repository_hashfile(
*/
error = git_path_join_unrooted(
- &full_path, path, repo ? git_repository_workdir(repo) : NULL, NULL);
+ &full_path, path, git_repository_workdir(repo), NULL);
if (error < 0)
return error;