global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/add-u-migration' (early part) into next

Browse Source 
* 'jc/add-u-migration' (early part):
  add: make "add -u/-A" update full tree without pathspec

Conflicts:
	builtin/add.c
This commit is contained in:
Junio C Hamano
2011-03-31 13:13:59 -07:00
parent b9bc9f1cea 33c33cac46
commit 962e0582cd
2 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
builtin/add.c
View File

@@ -310,6 +310,7 @@ N_("The following paths are ignored by one of your .gitignore files:\n");
static int verbose = 0, show_only = 0, ignored_too = 0, refresh_only = 0;
static int ignore_add_errors, addremove, intent_to_add, ignore_missing = 0;
static int default_tree_wide_update = -1;
static struct option builtin_add_options[] = {
OPT__DRY_RUN(&show_only, "dry run"),
@@ -335,6 +336,10 @@ static int add_config(const char *var, const char *value, void *cb)
ignore_add_errors = git_config_bool(var, value);
return 0;
}
if (!strcasecmp(var, "add.treewideupdate")) {
default_tree_wide_update = git_config_bool(var, value);
return 0;
}
return git_default_config(var, value, cb);
}
@@ -359,6 +364,29 @@ static int add_files(struct dir_struct *dir, int flags)
return exit_status;
}
static const char *warn_add_uA_180_migration_msg[] = {
"In release 1.8.0, running 'git add -u' (or 'git add -A') from",
"a subdirectory without giving any pathspec WILL take effect",
"on the whole working tree, not just the part under the current",
"directory. You can set add.treewideupdate configuration variable",
"to 'false' to keep the current behaviour.",
"You can set the configuration variable to 'true' to make the",
"'git add -u/-A' command without pathspec take effect on the whole",
"working tree now. If you do so, you can use '.' at the end of",
"the command, e.g. 'git add -u .' when you want to limit the",
"operation to the current directory.",
"This warning will be issued until you set the configuration variable",
"to either 'true' or 'false'."
};
static int warn_180_migration(void)
{
int i;
for (i = 0; i < ARRAY_SIZE(warn_add_uA_180_migration_msg); i++)
warning("%s", warn_add_uA_180_migration_msg[i]);
return 0; /* default to "no" (not tree-wide, i.e. local) */
}
int cmd_add(int argc, const char **argv, const char *prefix)
{
int exit_status = 0;
@@ -368,6 +396,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int flags;
int add_new_files;
int require_pathspec;
int whole_tree_add = 0;
char *seen = NULL;
git_config(add_config, NULL);
@@ -389,9 +418,13 @@ int cmd_add(int argc, const char **argv, const char *prefix)
if (!show_only && ignore_missing)
die(_("Option --ignore-missing can only be used together with --dry-run"));
if ((addremove || take_worktree_changes) && !argc) {
static const char *here[2] = { ".", NULL };
argc = 1;
argv = here;
whole_tree_add = 1;
if (prefix) {
if (default_tree_wide_update < 0)
default_tree_wide_update = warn_180_migration();
if (!default_tree_wide_update)
whole_tree_add = 0;
}
}
add_new_files = !take_worktree_changes && !refresh_only;
@@ -406,12 +439,16 @@ int cmd_add(int argc, const char **argv, const char *prefix)
(!(addremove || take_worktree_changes)
? ADD_CACHE_IGNORE_REMOVAL : 0));
if (require_pathspec && argc == 0) {
if (require_pathspec && !(argc || whole_tree_add)) {
fprintf(stderr, _("Nothing specified, nothing added.\n"));
fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
return 0;
}
pathspec = validate_pathspec(argc, argv, prefix);
if (whole_tree_add)
pathspec = NULL;
else
pathspec = validate_pathspec(argc, argv, prefix);
if (read_cache() < 0)
die(_("index file corrupt"));

49
t/t2200-add-update.sh
View File

@@ -80,6 +80,55 @@ test_expect_success 'change gets noticed' '
'
test_expect_success 'update from a subdirectory without pathspec (no config)' '
# This test needs to be updated to expect the whole tree
# update after 1.8.0 migration.
test_might_fail git config --remove add.treewideupdate &&
test_might_fail git reset check dir1 &&
echo changed >check &&
(
cd dir1 &&
echo even more >sub2 &&
git add -u 2>../expect.warning
) &&
git diff-files --name-only dir1 check >actual &&
echo check >expect &&
test_cmp expect actual &&
grep warning expect.warning
'
test_expect_success 'update from a subdirectory without pathspec (local)' '
test_when_finished "git config --remove add.treewideupdate; :" &&
git config add.treewideupdate false &&
test_might_fail git reset check dir1 &&
echo changed >check &&
(
cd dir1 &&
echo even more >sub2 &&
git add -u 2>../expect.warning
) &&
git diff-files --name-only dir1 check >actual &&
echo check >expect &&
test_cmp expect actual &&
! grep warning expect.warning
'
test_expect_success 'update from a subdirectory without pathspec (global)' '
test_when_finished "git config --remove add.treewideupdate; :" &&
git config add.treewideupdate true &&
test_might_fail git reset check dir1 &&
echo changed >check &&
(
cd dir1 &&
echo even more >sub2 &&
git add -u 2>../expect.warning
) &&
git diff-files --name-only dir1 check >actual &&
: >expect &&
test_cmp expect actual &&
! grep warning expect.warning
'
test_expect_success SYMLINKS 'replace a file with a symlink' '
rm foo &&