diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-17 16:36:54 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-17 16:36:54 -0500 |
| commit | a4221ccb099a11c020797ee199af01caa3cdd017 (patch) | |
| tree | 66d672b89bc297b109b038344b288ff2cfb5c6cc | |
| parent | 5915d7001b0084356ece3f23c5e7c3f2be17e39c (diff) | |
| parent | 692c040843dee45287d87ed81d4a1bd3684f5c97 (diff) | |
| download | libgit2-a4221ccb099a11c020797ee199af01caa3cdd017.tar.gz | |
Merge pull request #2699 from swisspol/fix_warnings
Fixed a couple Clang warnings
| -rw-r--r-- | src/checkout.c | 4 | ||||
| -rw-r--r-- | tests/status/worktree_init.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 44e2f3b27..4e879e36f 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -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); diff --git a/tests/status/worktree_init.c b/tests/status/worktree_init.c index 3e43c8c20..cc7e126f1 100644 --- a/tests/status/worktree_init.c +++ b/tests/status/worktree_init.c @@ -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" |