From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Matthieu Moy <git@matthieu-moy.fr>,
Michael J Gruber <git@grubix.eu>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 6/7] stage: add 'diff' subcommand
Date: Tue, 10 Aug 2021 23:57:26 -0500 [thread overview]
Message-ID: <20210811045727.2381-7-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210811045727.2381-1-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-stage.txt | 5 +++++
builtin/stage.c | 6 +++++-
t/t3710-stage.sh | 7 +++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.txt
index e2f83783b2..460a8d6228 100644
--- a/Documentation/git-stage.txt
+++ b/Documentation/git-stage.txt
@@ -12,6 +12,7 @@ SYNOPSIS
'git stage' [options] [--] [<paths>...]
'git stage' (-a | --add) [options] [--] [<paths>...]
'git stage' (-r | --remove) [options] [--] [<paths>...]
+'git stage' (-d | --diff) [options] [--] [<paths>...]
DESCRIPTION
@@ -32,11 +33,15 @@ OPTIONS
--remove::
Remove changes from the staging area. See linkgit:git-reset[1].
+-d::
+--diff::
+ View the changes staged for the next commit. See linkgit:git-diff[1].
SEE ALSO
--------
linkgit:git-add[1]
linkgit:git-reset[1]
+linkgit:git-diff[1]
GIT
---
diff --git a/builtin/stage.c b/builtin/stage.c
index 2d50b3c393..c57bb2d683 100644
--- a/builtin/stage.c
+++ b/builtin/stage.c
@@ -10,6 +10,7 @@ static const char *const stage_usage[] = {
N_("git stage [options] [--] <paths>..."),
N_("git stage --add [options] [--] <paths>..."),
N_("git stage --remove [options] [--] <paths>..."),
+ N_("git stage --diff [options] [<commit>] [--] <paths>..."),
NULL
};
@@ -41,11 +42,12 @@ static int rerun(int argc, const char **argv, ...)
int cmd_stage(int argc, const char **argv, const char *prefix)
{
- int add = 0, remove = 0;
+ int add = 0, remove = 0, diff = 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_BOOL_F('d', "diff", &diff, N_("show changes"), PARSE_OPT_NONEG),
OPT_END()
};
@@ -54,6 +56,8 @@ int cmd_stage(int argc, const char **argv, const char *prefix)
if (remove)
return rerun(argc, argv, "reset", NULL);
+ if (diff)
+ return rerun(argc, argv, "diff", "--staged", NULL);
return rerun(argc, argv, "add", NULL);
}
diff --git a/t/t3710-stage.sh b/t/t3710-stage.sh
index 834eee66d5..aab979c20c 100755
--- a/t/t3710-stage.sh
+++ b/t/t3710-stage.sh
@@ -35,4 +35,11 @@ test_expect_success 'unstage' '
! in_stage bar
'
+test_expect_success 'diff' '
+ echo foo > foo &&
+ git stage --add foo &&
+ git stage --diff > out &&
+ test_file_not_empty out
+'
+
test_done
--
2.32.0.48.g096519100f
next prev parent reply other threads:[~2021-08-11 4:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 4:57 [PATCH 0/7] [un]stage: officially start moving to "staging area" Felipe Contreras
2021-08-11 4:57 ` [PATCH 1/7] stage: add proper 'stage' command Felipe Contreras
2021-08-11 4:57 ` [PATCH 2/7] stage: add helper to run commands Felipe Contreras
2021-08-11 4:57 ` [PATCH 3/7] stage: add 'add' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 4/7] stage: add 'remove' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 5/7] unstage: add 'unstage' command Felipe Contreras
2021-08-11 4:57 ` Felipe Contreras [this message]
2021-08-11 6:12 ` [PATCH 6/7] stage: add 'diff' subcommand Bagas Sanjaya
2021-08-11 7:24 ` Felipe Contreras
2021-08-11 16:00 ` Junio C Hamano
2021-08-11 17:17 ` Felipe Contreras
2021-08-11 19:06 ` Jeff King
2021-08-11 20:18 ` Felipe Contreras
2021-08-11 20:30 ` Jeff King
2021-08-11 21:24 ` Felipe Contreras
2021-08-11 20:19 ` Michael J Gruber
2021-08-11 20:40 ` Jeff King
2021-08-11 20:51 ` Michael J Gruber
2021-08-11 21:02 ` Jeff King
2021-08-11 20:57 ` Junio C Hamano
2021-08-11 21:40 ` Felipe Contreras
2021-08-11 4:57 ` [PATCH 7/7] stage: add 'edit' command Felipe Contreras
2021-08-11 10:44 ` [PATCH 0/7] [un]stage: officially start moving to "staging area" Michael J Gruber
2021-08-11 16:55 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210811045727.2381-7-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@grubix.eu \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).