diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2018-08-17 00:51:51 +0200 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2018-08-17 00:51:51 +0200 |
| commit | 59c2e70eeee8b2bae79d05060599114a5f6d737a (patch) | |
| tree | 0d37664b7543f6c1a09721ce5afe69d5b2cc63b7 | |
| parent | 622e12c1b26210d5fb2f1136a3ab4d3c81c1d2c8 (diff) | |
| download | libgit2-59c2e70eeee8b2bae79d05060599114a5f6d737a.tar.gz | |
worktree: unlock should return 1 when the worktree isn't locked
The documentation states that git_worktree_unlock returns 0 on success,
and 1 on success if the worktree wasn't locked. Turns out we were
returning 0 in any of those cases.
| -rw-r--r-- | src/worktree.c | 2 | ||||
| -rw-r--r-- | tests/worktree/worktree.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/worktree.c b/src/worktree.c index 610fd7ee3..e06cdfb8d 100644 --- a/src/worktree.c +++ b/src/worktree.c @@ -426,7 +426,7 @@ int git_worktree_unlock(git_worktree *wt) assert(wt); if (!git_worktree_is_locked(NULL, wt)) - return 0; + return 1; if (git_buf_joinpath(&path, wt->gitdir_path, "locked") < 0) return -1; diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c index 6935f6005..73a6a0193 100644 --- a/tests/worktree/worktree.c +++ b/tests/worktree/worktree.c @@ -477,7 +477,7 @@ void test_worktree_worktree__unlock_unlocked_worktree(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_assert(!git_worktree_is_locked(NULL, wt)); - cl_assert(git_worktree_unlock(wt) == 0); + cl_assert_equal_i(1, git_worktree_unlock(wt)); cl_assert(!wt->locked); git_worktree_free(wt); @@ -490,7 +490,7 @@ void test_worktree_worktree__unlock_locked_worktree(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_git_pass(git_worktree_lock(wt, NULL)); cl_assert(git_worktree_is_locked(NULL, wt)); - cl_git_pass(git_worktree_unlock(wt)); + cl_assert_equal_i(0, git_worktree_unlock(wt)); cl_assert(!wt->locked); git_worktree_free(wt); |
