summaryrefslogtreecommitdiff
path: root/src/checkout.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-12-09 09:44:03 -0800
committerRussell Belfer <rb@github.com>2013-12-11 10:57:50 -0800
commit26c1cb91beccb44425864bd233ed0e35f5801868 (patch)
tree378f665d0adebca36a14a590f2103f2e5cd6c9ac /src/checkout.c
parentf10d7a368fa4af28b1e6f082349ffa4f62b3c00e (diff)
downloadlibgit2-26c1cb91beccb44425864bd233ed0e35f5801868.tar.gz
One more rename/cleanup for callback err functions
Diffstat (limited to 'src/checkout.c')
-rw-r--r--src/checkout.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/checkout.c b/src/checkout.c
index 4c64252e4..a292e3d4c 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -123,10 +123,13 @@ static int checkout_notify(
path = delta->old_file.path;
}
- return giterr_set_callback(
- data->opts.notify_cb(
- why, path, baseline, target, workdir, data->opts.notify_payload),
- "git_checkout notification");
+ {
+ int error = data->opts.notify_cb(
+ why, path, baseline, target, workdir, data->opts.notify_payload);
+
+ return giterr_set_after_callback_function(
+ error, "git_checkout notification");
+ }
}
static bool checkout_is_workdir_modified(