Re: [PATCH 3/5] reset: support the --pathspec-from-file option
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Nov 5, 2019, 16:14 UTC
- Message-ID
- <3cee48dd-15bb-1bec-6d23-d05cce0f4eb1@gmail.com>
- In-Reply-To
- <8d9f1fbc18346144a0c866a59891b652dcfe9b7f.1572895605.git.gitgitgadget@gmail.com>
Hi Alexandr
On 04/11/2019 19:26, Alexandr Miloslavskiy via GitGitGadget wrote:
Show 33 quoted lines
> From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
> [...]
> diff --git a/builtin/reset.c b/builtin/reset.c
> index fdd572168b..0eaa6b0bca 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -31,6 +31,7 @@
> static const char * const git_reset_usage[] = {
> N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
> N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
> + N_("git reset [-q] [--pathspec-from-file [--pathspec-file-null]] [<tree-ish>]"),
> N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
> NULL
> };
> @@ -284,8 +285,8 @@ static int git_reset_config(const char *var, const char *value, void *cb)
> int cmd_reset(int argc, const char **argv, const char *prefix)
> {
> int reset_type = NONE, update_ref_status = 0, quiet = 0;
> - int patch_mode = 0, unborn;
> - const char *rev;
> + int patch_mode = 0, pathspec_file_null = 0, unborn;
> + const char *rev, *pathspec_from_file = NULL;
> struct object_id oid;
> struct pathspec pathspec;
> int intent_to_add = 0;
> @@ -306,6 +307,10 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
> OPT_BOOL('N', "intent-to-add", &intent_to_add,
> N_("record only the fact that removed paths will be added later")),
> + OPT_FILENAME(0, "pathspec-from-file", &pathspec_from_file,
> + N_("read pathspecs from file")),
> + OPT_BOOL(0, "pathspec-file-null", &pathspec_file_null,
> + N_("with --pathspec-from-file, pathspecs are separated with NUL character")),One thing I forgot to mention before is that if you're going to add these options to a number of commands then maybe it is worth defining a macro for each one in parse-options.h. There are a couple of examples of this at the end of that file.
Best Wishes
Phillip
Show 156 quoted lines
> OPT_END()
> };
>
> @@ -316,6 +321,19 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> PARSE_OPT_KEEP_DASHDASH);
> parse_args(&pathspec, argv, prefix, patch_mode, &rev);
>
> + if (pathspec_from_file) {
> + if (patch_mode)
> + die(_("--pathspec-from-file is incompatible with --patch"));
> +
> + if (pathspec.nr)
> + die(_("--pathspec-from-file is incompatible with path arguments"));
> +
> + parse_pathspec_file(&pathspec, 0,
> + PATHSPEC_PREFER_FULL,
> + prefix, pathspec_from_file, pathspec_file_null);
> + } else if (pathspec_file_null)
> + die(_("--pathspec-file-null requires --pathspec-from-file"));
> +
> unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
> if (unborn) {
> /* reset on unborn branch: treat as reset to empty tree */
> diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
> new file mode 100755
> index 0000000000..cf7f085ad5
> --- /dev/null
> +++ b/t/t7107-reset-pathspec-file.sh
> @@ -0,0 +1,126 @@
> +#!/bin/sh
> +
> +test_description='reset --pathspec-from-file'
> +
> +. ./test-lib.sh
> +
> +cat > expect.a <<EOF
> + D fileA.t
> +EOF
> +
> +cat > expect.ab <<EOF
> + D fileA.t
> + D fileB.t
> +EOF
> +
> +cat > expect.a_bc_d <<EOF
> +D fileA.t
> + D fileB.t
> + D fileC.t
> +D fileD.t
> +EOF
> +
> +test_expect_success setup '
> + echo A >fileA.t &&
> + echo B >fileB.t &&
> + echo C >fileC.t &&
> + echo D >fileD.t &&
> + git add . &&
> + git commit --include . -m "Commit" &&
> + checkpoint=$(git rev-parse --verify HEAD)
> +'
> +
> +restore_checkpoint () {
> + git reset --hard "$checkpoint"
> +}
> +
> +verify_state () {
> + git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
> + test_cmp "$1" actual
> +}
> +
> +test_expect_success '--pathspec-from-file from stdin' '
> + restore_checkpoint &&
> +
> + git rm fileA.t &&
> + echo fileA.t | git reset --pathspec-from-file=- &&
> +
> + verify_state expect.a
> +'
> +
> +test_expect_success '--pathspec-from-file from file' '
> + restore_checkpoint &&
> +
> + git rm fileA.t &&
> + echo fileA.t >list &&
> + git reset --pathspec-from-file=list &&
> +
> + verify_state expect.a
> +'
> +
> +test_expect_success 'NUL delimiters' '
> + restore_checkpoint &&
> +
> + git rm fileA.t fileB.t &&
> + printf fileA.tQfileB.t | q_to_nul | git reset --pathspec-from-file=- --pathspec-file-null &&
> +
> + verify_state expect.ab
> +'
> +
> +test_expect_success 'LF delimiters' '
> + restore_checkpoint &&
> +
> + git rm fileA.t fileB.t &&
> + printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
> +
> + verify_state expect.ab
> +'
> +
> +test_expect_success 'CRLF delimiters' '
> + restore_checkpoint &&
> +
> + git rm fileA.t fileB.t &&
> + printf "fileA.t\r\nfileB.t" | git reset --pathspec-from-file=- &&
> +
> + verify_state expect.ab
> +'
> +
> +test_expect_success 'quotes' '
> + restore_checkpoint &&
> +
> + git rm fileA.t &&
> + printf "\"file\\101.t\"" | git reset --pathspec-from-file=- &&
> +
> + verify_state expect.a
> +'
> +
> +test_expect_success 'quotes not compatible with --pathspec-file-null' '
> + restore_checkpoint &&
> +
> + git rm fileA.t &&
> + printf "\"file\\101.t\"" >list &&
> + # Note: "git reset" has not yet learned to fail on wrong pathspecs
> + git reset --pathspec-from-file=list --pathspec-file-null &&
> +
> + test_must_fail verify_state expect.a
> +'
> +
> +test_expect_success '--pathspec-from-file is not compatible with --soft --hard' '
> + restore_checkpoint &&
> +
> + git rm fileA.t &&
> + echo fileA.t >list &&
> + test_must_fail git reset --soft --pathspec-from-file=list &&
> + test_must_fail git reset --hard --pathspec-from-file=list
> +'
> +
> +test_expect_success 'only touches what was listed' '
> + restore_checkpoint &&
> +
> + git rm fileA.t fileB.t fileC.t fileD.t &&
> + printf "fileB.t\nfileC.t" | git reset --pathspec-from-file=- &&
> +
> + verify_state expect.a_bc_d
> +'
> +
> +test_done
>