On Mon, May 27, 2013 at 11:52:19AM -0500, Felipe Contreras wrote:
> Pretty much what it says on the tin.
>
> Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
> ---
> Documentation/git-cherry-pick.txt | 3 +++
> builtin/revert.c | 2 ++
> sequencer.c | 5 ++++-
> sequencer.h | 1 +
> t/t3508-cherry-pick-many-commits.sh | 13 +++++++++++++
> 5 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-cherry-pick.txt
> b/Documentation/git-cherry-pick.txt
> index c205d23..fccd936 100644
> --- a/Documentation/git-cherry-pick.txt
> +++ b/Documentation/git-cherry-pick.txt
> @@ -129,6 +129,9 @@ effect to your index in a row.
> redundant commits are ignored. This option overrides that behavior and
> creates an empty commit object. Implies `--allow-empty`.
>
> +--skip-empty::
> + Instead of failing, skip commits that are or become empty.
> +
> --strategy=<strategy>::
> Use the given merge strategy. Should only be used once.
> See the MERGE STRATEGIES section in linkgit:git-merge[1]
> diff --git a/builtin/revert.c b/builtin/revert.c
> index 0401fdb..0e5ce71 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -118,6 +118,7 @@ static void parse_args(int argc, const char **argv,
> struct replay_opts *opts)
> OPT_END(),
> OPT_END(),
> OPT_END(),
> + OPT_END(),
> };
>
> if (opts->action == REPLAY_PICK) {
> @@ -127,6 +128,7 @@ static void parse_args(int argc, const char **argv,
> struct replay_opts *opts)
> OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty,
> N_("preserve initially empty commits")),
> OPT_BOOLEAN(0, "allow-empty-message",
> &opts->allow_empty_message, N_("allow commits with empty messages")),
> OPT_BOOLEAN(0, "keep-redundant-commits",
> &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
> + OPT_BOOLEAN(0, "skip-empty", &opts->skip_empty,
> N_("skip empty commits")),
> OPT_END(),
> };
I like the idea, but this option seems a bit awkward to me. At the very least
here, don't you now need to check for conflicts if --keep-redundant-commits and
skip-empty are both specified (as iirc git doens't see the difference between
empty commits and commits made empty by prior commits in the current history).
what if we merged the two options to an OPT_STRING, something like
--empty-commits=[keep|skip|ask]. The default currently is an impiled, since the
sequencer stops on an empty commit.
Neil
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
