git add <pathspec>... defaults to "-A"
Make "git add <pathspec>..." notice paths that have been removed from the working tree, i.e. the same as "git add -A <pathspec>...". Given that "git add <pathspec>" is to update the index with the state of the named part of the working tree as a whole, it makes it more intuitive, and also makes it possible to simplify the advice we give while marking the paths the user finished resolving conflicts with. We used to say "to record removal as a resolution, remove the path from the working tree and say 'git rm'; for all other cases, edit the path in the working tree and say 'git add'", but we can now say "update the path in the working tree and say 'git add'" instead. As promised, this merges the temporary update_files_in_cache() helper function back to add_files_to_cache() function. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 22, 2013 at 14:30 UTC
fdc97abd4a8b04781356dc561b4ba5a634f9854f
2 files changed
+15
-46
Documentation/git-add.txt
+11
-7
@@ -53,8 +53,14 @@ OPTIONS
53
Files to add content from. Fileglobs (e.g. `*.c`) can
54
be given to add all matching files. Also a
55
leading directory name (e.g. `dir` to add `dir/file1`
56
- and `dir/file2`) can be given to add all files in the
57
- directory, recursively.
56
+ and `dir/file2`) can be given to update the index to
57
+ match the current state of the directory as a whole (e.g.
58
+ specifying `dir` will record not just a file `dir/file1`
59
+ modified in the working tree, a file `dir/file2` added to
60
+ the working tree, but also a file `dir/file3` removed from
61
+ the working tree. Note that older versions of Git used
62
+ to ignore removed files; use `--no-all` option if you want
63
+ to add modified or new files but ignore removed ones.
64
65
-n::
66
--dry-run::
@@ -129,11 +135,9 @@ of Git, hence the form without <pathspec> should not be used.
135
files that have been removed from the working tree. This
136
option is a no-op when no <pathspec> is used.
137
+
132
-This option is primarily to help the current users of Git, whose
133
-"git add <pathspec>..." ignores removed files. In future versions
134
-of Git, "git add <pathspec>..." will be a synonym to "git add -A
135
-<pathspec>..." and "git add --ignore-removal <pathspec>..." will behave like
136
-today's "git add <pathspec>...", ignoring removed files.
138
+This option is primarily to help users who are used to older
139
+versions of Git, whose "git add <pathspec>..." was a synonym
140
+for "git add --no-all <pathspec>...", i.e. ignored removed files.
141
142
-N::
143
--intent-to-add::
builtin/add.c
+4
-39
@@ -28,9 +28,6 @@ struct update_callback_data {
28
int add_errors;
29
const char *implicit_dot;
30
size_t implicit_dot_len;
31
-
32
- /* only needed for 2.0 transition preparation */
33
- int warn_add_would_remove;
31
};
32
33
static const char *option_with_implicit_dot;
@@ -96,24 +93,6 @@ static int fix_unmerged_status(struct diff_filepair *p,
93
return DIFF_STATUS_MODIFIED;
94
}
95
99
-static const char *add_would_remove_warning = N_(
100
- "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
101
-"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
102
-"Paths like '%s' that are\n"
103
-"removed from your working tree are ignored with this version of Git.\n"
104
-"\n"
105
-"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
106
-" ignores paths you removed from your working tree.\n"
107
-"\n"
108
-"* 'git add --all <pathspec>' will let you also record the removals.\n"
109
-"\n"
110
-"Run 'git status' to check the paths you removed from your working tree.\n");
111
-
112
-static void warn_add_would_remove(const char *path)
113
-{
114
- warning(_(add_would_remove_warning), path);
115
-}
116
-
96
static void update_callback(struct diff_queue_struct *q,
97
struct diff_options *opt, void *cbdata)
98
{
@@ -151,10 +130,6 @@ static void update_callback(struct diff_queue_struct *q,
130
}
131
break;
132
case DIFF_STATUS_DELETED:
154
- if (data->warn_add_would_remove) {
155
- warn_add_would_remove(path);
156
- data->warn_add_would_remove = 0;
157
- }
133
if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
134
break;
135
if (!(data->flags & ADD_CACHE_PRETEND))
@@ -378,7 +353,7 @@ N_("The following paths are ignored by one of your .gitignore files:\n");
353
static int verbose, show_only, ignored_too, refresh_only;
354
static int ignore_add_errors, intent_to_add, ignore_missing;
355
381
-#define ADDREMOVE_DEFAULT 0 /* Change to 1 in Git 2.0 */
356
+#define ADDREMOVE_DEFAULT 1
357
static int addremove = ADDREMOVE_DEFAULT;
358
static int addremove_explicit = -1; /* unspecified */
359
@@ -476,20 +451,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
451
if (addremove && take_worktree_changes)
452
die(_("-A and -u are mutually incompatible"));
453
479
- /*
480
- * Warn when "git add pathspec..." was given without "-u" or "-A"
481
- * and pathspec... covers a removed path.
482
- */
483
- memset(&update_data, 0, sizeof(update_data));
484
- if (!take_worktree_changes && addremove_explicit < 0)
485
- update_data.warn_add_would_remove = 1;
486
-
454
if (!take_worktree_changes && addremove_explicit < 0 && argc)
488
- /*
489
- * Turn "git add pathspec..." to "git add -A pathspec..."
490
- * in Git 2.0 but not yet
491
- */
492
- ; /* addremove = 1; */
455
+ /* Turn "git add pathspec..." to "git add -A pathspec..." */
456
+ addremove = 1;
457
458
if (!show_only && ignore_missing)
459
die(_("Option --ignore-missing can only be used together with --dry-run"));
@@ -579,6 +543,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
543
544
plug_bulk_checkin();
545
546
+ memset(&update_data, 0, sizeof(update_data));
547
if ((flags & ADD_CACHE_IMPLICIT_DOT) && prefix) {
548
/*
549
* Check for modified files throughout the worktree so