summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-11-25 13:15:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-25 19:37:55 (GMT)
commitb63e99500137c913bd801a2f22b6cf88c63b95c5 (patch)
tree68a58fb97935f35c6fb7bcbcfed73b1697db000a /builtin-add.c
parent3f061887c562b20d3ed3d1f764462cf986a1ad12 (diff)
downloadgit-b63e99500137c913bd801a2f22b6cf88c63b95c5.zip
git-b63e99500137c913bd801a2f22b6cf88c63b95c5.tar.gz
git-b63e99500137c913bd801a2f22b6cf88c63b95c5.tar.bz2
Add "--patch" option to git-add--interactive
When the "--patch" option is supplied, the patch_update_cmd() function is called bypassing the main_loop() and exits. Seeing as builtin-add is the only caller of git-add--interactive we can impose a strict requirement on the format of the arguments to avoid possible ambiguity: an "--" argument must be used whenever any pathspecs are passed, both with the "--patch" option and without it. Signed-off-by: Wincent Colaiuta <win@wincent.com>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 865c475..5c29cc2 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -19,7 +19,7 @@ static const char * const builtin_add_usage[] = {
"git-add [options] [--] <filepattern>...",
NULL
};
-
+static int patch_interactive = 0, add_interactive = 0;
static int take_worktree_changes;
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
@@ -144,7 +144,7 @@ static const char **validate_pathspec(int argc, const char **argv, const char *p
int interactive_add(int argc, const char **argv, const char *prefix)
{
- int status;
+ int status, ac;
const char **args;
const char **pathspec = NULL;
@@ -154,11 +154,17 @@ int interactive_add(int argc, const char **argv, const char *prefix)
return -1;
}
- args = xcalloc(sizeof(const char *), (argc + 2));
- args[0] = "add--interactive";
- if (argc)
- memcpy(&(args[1]), pathspec, sizeof(const char *) * argc);
- args[argc + 1] = NULL;
+ args = xcalloc(sizeof(const char *), (argc + 4));
+ ac = 0;
+ args[ac++] = "add--interactive";
+ if (patch_interactive)
+ args[ac++] = "--patch";
+ args[ac++] = "--";
+ if (argc) {
+ memcpy(&(args[ac]), pathspec, sizeof(const char *) * argc);
+ ac += argc;
+ }
+ args[ac] = NULL;
status = run_command_v_opt(args, RUN_GIT_CMD);
free(args);
@@ -171,13 +177,13 @@ static const char ignore_error[] =
"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 add_interactive = 0;
static struct option builtin_add_options[] = {
OPT__DRY_RUN(&show_only),
OPT__VERBOSE(&verbose),
OPT_GROUP(""),
OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
+ OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"),
OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"),
OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"),
@@ -192,6 +198,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, builtin_add_options,
builtin_add_usage, 0);
+ if (patch_interactive)
+ add_interactive = 1;
if (add_interactive)
exit(interactive_add(argc, argv, prefix));