Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
Documentation/git-stage.txt | 5 +++
builtin/stage.c | 76 ++++++++++++++++++++++++++++++++++++-
t/t3710-stage.sh | 6 +++
3 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.txt
index 460a8d6228..baea9d96e0 100644
--- a/Documentation/git-stage.txt
+++ b/Documentation/git-stage.txt
@@ -13,6 +13,7 @@ SYNOPSIS
'git stage' (-a | --add) [options] [--] [<paths>...]
'git stage' (-r | --remove) [options] [--] [<paths>...]
'git stage' (-d | --diff) [options] [--] [<paths>...]
+'git stage' (-e | --edit)
DESCRIPTION
@@ -37,6 +38,10 @@ OPTIONS
--diff::
View the changes staged for the next commit. See linkgit:git-diff[1].
+-e::
+--edit::
+ Edit the changes in the staging area.
+
SEE ALSO
--------
linkgit:git-add[1]
diff --git a/builtin/stage.c b/builtin/stage.c
index c57bb2d683..49af18dda7 100644
--- a/builtin/stage.c
+++ b/builtin/stage.c
@@ -5,6 +5,9 @@
#include "builtin.h"
#include "parse-options.h"
#include "run-command.h"
+#include "diff.h"
+#include "diffcore.h"
+#include "revision.h"
static const char *const stage_usage[] = {
N_("git stage [options] [--] <paths>..."),
@@ -40,14 +43,83 @@ static int rerun(int argc, const char **argv, ...)
return ret;
}
+static int do_reset(const char *prefix)
+{
+ const char *argv[] = { "reset", "--quiet", NULL };
+ return run_command_v_opt(argv, RUN_GIT_CMD);
+}
+
+static int do_apply(const char *file, const char *prefix)
+{
+ const char *argv[] = { "apply", "--recount", "--cached", file, NULL };
+ return run_command_v_opt(argv, RUN_GIT_CMD);
+}
+
+static int run_edit(int argc, const char **argv, const char *prefix)
+{
+ char *file = git_pathdup("STAGE_EDIT.patch");
+ int out;
+ struct rev_info rev;
+ int ret = 0;
+ struct stat st;
+
+ repo_read_index(the_repository);
+
+ repo_init_revisions(the_repository, &rev, prefix);
+ rev.diffopt.context = 7;
+
+ argc = setup_revisions(argc, argv, &rev, NULL);
+ add_head_to_pending(&rev);
+ if (!rev.pending.nr) {
+ struct tree *tree;
+ tree = lookup_tree(the_repository, the_repository->hash_algo->empty_tree);
+ add_pending_object(&rev, &tree->object, "HEAD");
+ }
+
+ rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+ rev.diffopt.use_color = 0;
+ rev.diffopt.flags.ignore_dirty_submodules = 1;
+
+ out = open(file, O_CREAT | O_WRONLY, 0666);
+ if (out < 0)
+ die(_("Could not open '%s' for writing."), file);
+ rev.diffopt.file = xfdopen(out, "w");
+ rev.diffopt.close_file = 1;
+
+ if (run_diff_index(&rev, DIFF_INDEX_CACHED))
+ die(_("Could not write patch"));
+ if (launch_editor(file, NULL, NULL))
+ exit(1);
+
+ if (stat(file, &st))
+ die_errno(_("Could not stat '%s'"), file);
+
+ ret = do_reset(prefix);
+ if (ret)
+ goto leave;
+
+ if (!st.st_size)
+ goto leave;
+
+ ret = do_apply(file, prefix);
+ if (ret)
+ goto leave;
+
+leave:
+ unlink(file);
+ free(file);
+ return ret;
+}
+
int cmd_stage(int argc, const char **argv, const char *prefix)
{
- int add = 0, remove = 0, diff = 0;
+ int add = 0, remove = 0, diff = 0, edit = 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_BOOL_F('e', "edit", &edit, N_("edit changes"), PARSE_OPT_NONEG),
OPT_END()
};
@@ -58,6 +130,8 @@ int cmd_stage(int argc, const char **argv, const char *prefix)
return rerun(argc, argv, "reset", NULL);
if (diff)
return rerun(argc, argv, "diff", "--staged", NULL);
+ if (edit)
+ return run_edit(argc, argv, prefix);
return rerun(argc, argv, "add", NULL);
}
diff --git a/t/t3710-stage.sh b/t/t3710-stage.sh
index aab979c20c..3c9522249f 100755
--- a/t/t3710-stage.sh
+++ b/t/t3710-stage.sh
@@ -42,4 +42,10 @@ test_expect_success 'diff' '
test_file_not_empty out
'
+test_expect_success 'edit' '
+ GIT_EDITOR="sed -i -e \"s/^+foo$/+edit/\"" git stage --edit &&
+ git stage --diff > out &&
+ grep "^+edit$" out
+'
+
test_done
--
2.32.0.48.g096519100f
