Merge pull request #2829 from jacquesg/dead-code

Remove logically dead code (we're already asserting)
This commit is contained in:
Edward Thomson 2015-01-21 09:20:54 -06:00
commit a789b36100
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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;