diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-28 15:12:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-29 17:35:21 -0700 |
| commit | 2e2b887d1c2c2385825160e587d711ecb5935ef5 (patch) | |
| tree | 6beed288d6482e1e3857549370c03feeaf7a1215 /builtin-checkout.c | |
| parent | 6286a08db3d1e718f4be6959d0f380215026800b (diff) | |
| download | git-2e2b887d1c2c2385825160e587d711ecb5935ef5.tar.gz | |
unpack_trees(): allow callers to differentiate worktree errors from merge errors
Instead of uniformly returning -1 on any error, this teaches
unpack_trees() to return -2 when the merge itself is Ok but worktree
refuses to get updated.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
0 files changed, 0 insertions, 0 deletions