summaryrefslogtreecommitdiff
path: root/src/path.c
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2012-11-13 14:13:47 -0800
committerVicent Martí <vicent@github.com>2012-11-13 14:13:47 -0800
commitaa1c3b588edae7c6d718e85bce54d990c69cd535 (patch)
tree3004114ad897d7c8070f9c588feb96af86d0261f /src/path.c
parent262274748f1c3cb6de4fa621100033eda6984166 (diff)
parent757b406504021b3a73e52ce9f95d590d65c7dce5 (diff)
downloadlibgit2-aa1c3b588edae7c6d718e85bce54d990c69cd535.tar.gz
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
Update checkout with new strategies & behavior
Diffstat (limited to 'src/path.c')
-rw-r--r--src/path.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/path.c b/src/path.c
index 09556bd3f..98351bec3 100644
--- a/src/path.c
+++ b/src/path.c
@@ -382,9 +382,10 @@ int git_path_walk_up(
iter.asize = path->asize;
while (scan >= stop) {
- if ((error = cb(data, &iter)) < 0)
- break;
+ error = cb(data, &iter);
iter.ptr[scan] = oldc;
+ if (error < 0)
+ break;
scan = git_buf_rfind_next(&iter, '/');
if (scan >= 0) {
scan++;