Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:32
Junio C Hamano [off-list ref] writes:
Felipe Contreras [off-list ref] writes:quoted
Pretty much what it says on the tin. Signed-off-by: Felipe Contreras <redacted> --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c | 2 ++ sequencer.c | 6 ++++++ sequencer.h | 1 + t/t3508-cherry-pick-many-commits.sh | 13 +++++++++++++ 5 files changed, 25 insertions(+)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.Not quite sure. Is this "instead of recording an empty commit," (which may or may not fail depending on the allow-empty settings)? If that is what this patch is meant to do, I think the change makes sense.
Also what I noticed while looking at 4-5/8. Wouldn't "revert --skip-empty A..B" make sense as well?