diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2014-11-21 17:08:19 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-21 10:19:14 -0800 |
commit | 1d31e5a2cd9f90799330d5095783e7b972357f0e (patch) | |
tree | 4c4818b087c976b037874f9c8db057307aede563 /builtin/prune-packed.c | |
parent | l10n: remove a superfluous translation for push.c (diff) | |
download | tgif-1d31e5a2cd9f90799330d5095783e7b972357f0e.tar.xz |
add: ignore only ignored files
"git add foo bar" adds neither foo nor bar when bar is ignored, but dies
to let the user recheck their command invocation. This becomes less
helpful when "git add foo.*" is subject to shell expansion and some of
the expanded files are ignored.
"git add --ignore-errors" is supposed to ignore errors when indexing
some files and adds the others. It does ignore errors from actual
indexing attempts, but does not ignore the error "file is ignored" as
outlined above. This is unexpected.
Change "git add foo bar" to add foo when bar is ignored, but issue
a warning and return a failure code as before the change.
That is, in the case of trying to add ignored files we now act the same
way (with or without "--ignore-errors") in which we act for more
severe indexing errors when "--ignore-errors" is specified.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/prune-packed.c')
0 files changed, 0 insertions, 0 deletions