diff options
| author | Vicent Martà <vicent@github.com> | 2012-11-01 14:18:40 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-11-01 14:18:40 -0700 |
| commit | d13da328e2807e098295bb9bead4d23560c27320 (patch) | |
| tree | 9b1fae728b538c0979381f384b1ac74cb866a472 /src | |
| parent | 60ad7d52b8828a7c1fd0720e166d00a6ea3fe6bc (diff) | |
| parent | b90500f03d3ae60f1f79d7adb36d95632a29d7e5 (diff) | |
| download | libgit2-d13da328e2807e098295bb9bead4d23560c27320.tar.gz | |
Merge pull request #1038 from arrbee/doc-fixes
Improve docs, examples, warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/refs.c | 4 | ||||
| -rw-r--r-- | src/status.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/refs.c b/src/refs.c index 779d6080f..bbf30ed9e 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1949,10 +1949,10 @@ int git_reference_peel( peel_error(error, ref, "Cannot retrieve reference target"); goto cleanup; } - + if (target_type == GIT_OBJ_ANY && git_object_type(target) != GIT_OBJ_TAG) error = git_object__dup(peeled, target); - else + else error = git_object_peel(peeled, target, target_type); cleanup: diff --git a/src/status.c b/src/status.c index f57100d11..2d022bfda 100644 --- a/src/status.c +++ b/src/status.c @@ -217,7 +217,7 @@ static int get_one_status(const char *path, unsigned int status, void *data) sfi->count++; sfi->status = status; - if (sfi->count > 1 || + if (sfi->count > 1 || (strcmp(sfi->expected, path) != 0 && p_fnmatch(sfi->expected, path, 0) != 0)) { giterr_set(GITERR_INVALID, |