diff options
author | Jeff King <peff@peff.net> | 2016-01-31 22:18:24 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-01 13:43:49 -0800 |
commit | 22396175267b7bcef97a02036831152539429bec (patch) | |
tree | ccf87b8a94dd117a7e2403770dc5458043bb372e /xdiff | |
parent | checkout-index: handle "--no-index" option (diff) | |
download | tgif-22396175267b7bcef97a02036831152539429bec.tar.xz |
checkout-index: disallow "--no-stage" option
We do not really expect people to use "--no-stage", but if
they do, git currently segfaults. We could instead have it
undo the effects of a previous "--stage", but this gets
tricky around the "to_tempfile" flag. We cannot simply reset
it to 0, because we don't know if it was set by a previous
"--stage=all" or an explicit "--temp" option.
We could solve this by setting a flag and resolving
to_tempfile later, but it's not worth the effort. Nobody
actually wants to use "--no-stage"; we are just trying to
fix a potential segfault here.
While we're in the area, let's improve the user-facing
messages for this option. The error string should be
translatable, and we should give some hint in the "-h"
output about what can go in the argument field.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions