[PATCH 4/7] stage: add 'remove' subcommand
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-stage.txt | 6 ++++++
builtin/stage.c | 7 ++++++-
t/t3710-stage.sh | 5 +++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.txt
index 348d7d1d92..e2f83783b2 100644
--- a/Documentation/git-stage.txt
+++ b/Documentation/git-stage.txt
@@ -11,6 +11,7 @@ SYNOPSIS
[verse]
'git stage' [options] [--] [<paths>...]
'git stage' (-a | --add) [options] [--] [<paths>...]
+'git stage' (-r | --remove) [options] [--] [<paths>...]
DESCRIPTION
@@ -27,10 +28,15 @@ OPTIONS
--add::
Add changes to the staging area. See linkgit:git-add[1].
+-r::
+--remove::
+ Remove changes from the staging area. See linkgit:git-reset[1].
+
SEE ALSO
--------
linkgit:git-add[1]
+linkgit:git-reset[1]
GIT
---
diff --git a/builtin/stage.c b/builtin/stage.c
index 5a80bbc76c..dee8781dc5 100644
--- a/builtin/stage.c
+++ b/builtin/stage.c
@@ -9,6 +9,7 @@
static const char *const stage_usage[] = {
N_("git stage [options] [--] <paths>..."),
N_("git stage --add [options] [--] <paths>..."),
+ N_("git stage --remove [options] [--] <paths>..."),
NULL
};
@@ -35,15 +36,19 @@ static int rerun(int argc, const char **argv, ...)
int cmd_stage(int argc, const char **argv, const char *prefix)
{
- int add = 0;
+ int add = 0, remove = 0;
struct option options[] = {
OPT_BOOL_F('a', "add", &add, N_("add changes"), PARSE_OPT_NONEG),
+ OPT_BOOL_F('r', "remove", &remove, N_("remove changes"), PARSE_OPT_NONEG),
OPT_END()
};
argc = parse_options(argc, argv, prefix, options, stage_usage,
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
+ if (remove)
+ return rerun(argc, argv, "reset", NULL);
+
return rerun(argc, argv, "add", NULL);
}
diff --git a/t/t3710-stage.sh b/t/t3710-stage.sh
index 225c6dd739..209f2bde9a 100755
--- a/t/t3710-stage.sh
+++ b/t/t3710-stage.sh
@@ -23,4 +23,9 @@ test_expect_success 'add' '
in_stage bar
'
+test_expect_success 'remove' '
+ git stage --remove bar &&
+ ! in_stage bar
+'
+
test_done
--
2.32.0.48.g096519100f
Felipe Contreras <felipe.contreras@gmail.com>