diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-01-21 09:20:54 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-01-21 09:20:54 -0600 |
| commit | a789b361004da746b02919631a333170dfe20819 (patch) | |
| tree | caa977f54960adaba737d57d27903dbb5b0f8780 | |
| parent | 68302ed20f8856c70fb20bd6becb83082fb8abd4 (diff) | |
| parent | 9ae4ad2dafd918b95dc976bed97604a985a2b4dd (diff) | |
| download | libgit2-a789b361004da746b02919631a333170dfe20819.tar.gz | |
Merge pull request #2829 from jacquesg/dead-code
Remove logically dead code (we're already asserting)
| -rw-r--r-- | src/pool.c | 2 | ||||
| -rw-r--r-- | src/repository.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pool.c b/src/pool.c index a5dfa0f49..7350c04c1 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 0cf8eb66b..f49a25124 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; |