diff options
| author | Russell Belfer <rb@github.com> | 2013-12-04 21:22:57 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-11 10:57:49 -0800 |
| commit | dab89f9b6821b67dd07c8bd4dbb53e25a3e687c7 (patch) | |
| tree | c7f4f4738dfb249b7534635226128d2e20dac6a5 /src/indexer.c | |
| parent | 96869a4edb2872934e0e167a726ab240f4270fea (diff) | |
| download | libgit2-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/indexer.c')
| -rw-r--r-- | src/indexer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/indexer.c b/src/indexer.c index 852a04120..7312809bf 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -387,10 +387,8 @@ on_error: static int do_progress_callback(git_indexer *idx, git_transfer_progress *stats) { if (idx->progress_cb && - idx->progress_cb(stats, idx->progress_payload)) { - giterr_clear(); - return GIT_EUSER; - } + idx->progress_cb(stats, idx->progress_payload)) + return giterr_user_cancel(); return 0; } |