diff options
author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-07 11:39:52 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-09 23:16:51 -0800 |
commit | 17e464266701bc1453f60a80cd71d8ba55b528e6 (patch) | |
tree | 999bbdc1cd580846811ca415968d57e811ed8e19 /git-gui | |
parent | 203a2fe117070964a5bf7cc940a742cad7a19fca (diff) | |
download | git-17e464266701bc1453f60a80cd71d8ba55b528e6.tar.gz git-17e464266701bc1453f60a80cd71d8ba55b528e6.tar.xz |
Add flag to make unpack_trees() not print errors.
(This applies only to errors where a plausible operation is impossible due
to the particular data, not to errors resulting from misuse of the merge
functions.)
This will allow builtin-checkout to suppress merge errors if it's
going to try more merging methods.
Additionally, if unpack_trees() returns with an error, but without
printing anything, it will roll back any changes to the index (by
rereading the index, currently). This obviously could be done by the
caller, but chances are that the caller would forget and debugging
this is difficult. Also, future implementations may give unpack_trees() a
more efficient way of undoing its changes than the caller could.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions