Commit 692c0408 by Pierre-Olivier Latour

Fixed a couple Clang warnings

parent 4865cc3f
......@@ -1145,12 +1145,16 @@ static int checkout_conflict_append_remove(
checkout_data *data = payload;
const char *name;
assert(ancestor || ours || theirs);
if (ancestor)
name = git__strdup(ancestor->path);
else if (ours)
name = git__strdup(ours->path);
else if (theirs)
name = git__strdup(theirs->path);
else
abort();
GITERR_CHECK_ALLOC(name);
......
......@@ -127,7 +127,6 @@ void test_status_worktree_init__bracket_in_filename(void)
git_index *index;
status_entry_single result;
unsigned int status_flags;
int error;
#define FILE_WITH_BRACKET "LICENSE[1].md"
#define FILE_WITHOUT_BRACKET "LICENSE1.md"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment