proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 19:47:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a couple Clang warnings

Browse Source
This commit is contained in:
Pierre-Olivier Latour 2014-11-09 08:09:25 +09:00
parent 4865cc3f06
commit 692c040843
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/checkout.c
View File

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

1
tests/status/worktree_init.c
View File

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