development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

git add: rephrase the "removal will cease to be ignored" warning

Browse source 
Now the logic to decide when to warn has been tightened, we know the
user is in a situation where the current and future behaviours will
be different.  Spell out what happens with these two versions and
how to explicitly ask for the behaviour, and suggest "git status" as
a way to inspect the current status.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2013-04-21 21:04:35 -07:00
parent d226b14d47
commit ccc663bc24
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
builtin/add.c
View file

@ -52,15 +52,22 @@ static int fix_unmerged_status(struct diff_filepair *p,
return DIFF_STATUS_MODIFIED;
}
static const char *add_would_remove_warning = N_(
"You ran 'git add' with neither '-A (--all)' or '--no-all', whose\n"
"behaviour will change in Git 2.0 with respect to paths you removed from\n"
"your working tree. Paths like '%s' that are\n"
"removed are ignored with this version of Git.\n"
"\n"
"* 'git add --no-all <pathspec>', which is the current default, ignores\n"
" paths you removed from your working tree.\n"
"\n"
"* 'git add --all <pathspec>' will let you also record the removals.\n"
"\n"
"Run 'git status' to check the paths you removed from your working tree.\n");
static void warn_add_would_remove(const char *path)
{
warning(_("In Git 2.0, 'git add <pathspec>...' will also update the\n"
"index for paths removed from the working tree that match\n"
"the given pathspec. If you want to 'add' only changed\n"
"or newly created paths, say 'git add --no-all <pathspec>...'"
" instead.\n\n"
"'%s' would be removed from the index without --no-all."),
path);
warning(_(add_would_remove_warning), path);
}
static void update_callback(struct diff_queue_struct *q,