summaryrefslogtreecommitdiff
path: root/src/push.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-12-04 21:22:57 -0800
committerRussell Belfer <rb@github.com>2013-12-11 10:57:49 -0800
commitdab89f9b6821b67dd07c8bd4dbb53e25a3e687c7 (patch)
treec7f4f4738dfb249b7534635226128d2e20dac6a5 /src/push.c
parent96869a4edb2872934e0e167a726ab240f4270fea (diff)
downloadlibgit2-dab89f9b6821b67dd07c8bd4dbb53e25a3e687c7.tar.gz
Further EUSER and error propagation fixes
This continues auditing all the places where GIT_EUSER is being returned and making sure to clear any existing error using the new giterr_user_cancel helper. As a result, places that relied on intercepting GIT_EUSER but having the old error preserved also needed to be cleaned up to correctly stash and then retrieve the actual error. Additionally, as I encountered places where error codes were not being propagated correctly, I tried to fix them up. A number of those fixes are included in the this commit as well.
Diffstat (limited to 'src/push.c')
-rw-r--r--src/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/push.c b/src/push.c
index 3c9d5bb35..e592249d9 100644
--- a/src/push.c
+++ b/src/push.c
@@ -663,7 +663,7 @@ int git_push_status_foreach(git_push *push,
git_vector_foreach(&push->status, i, status) {
if (cb(status->ref, status->msg, data) < 0)
- return GIT_EUSER;
+ return giterr_user_cancel();
}
return 0;