projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6286a08) | patch
unpack_trees(): allow callers to differentiate worktree errors from merge errors
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 May 2008 22:12:30 +0000 (15:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 May 2008 00:35:21 +0000 (17:35 -0700)
commit2e2b887d1c2c2385825160e587d711ecb5935ef5
tree6beed288d6482e1e3857549370c03feeaf7a1215tree | snapshot
parent6286a08db3d1e718f4be6959d0f380215026800bcommit | diff
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>
unpack-trees.c diff | blob | history
Git—the stupid content tracker