From: Neil Horman <nhorman@tuxdriver.com>
To: git@vger.kernel.org
Cc: Clemens Buchacher <drizzd@aon.at>,
Phil Hord <phil.hord@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Neil Horman <nhorman@tuxdriver.com>
Subject: [PATCH v7 4/4] git-rebase: add keep_empty flag
Date: Wed, 18 Apr 2012 15:18:00 -0400 [thread overview]
Message-ID: <1334776680-23460-5-git-send-email-nhorman@tuxdriver.com> (raw)
In-Reply-To: <1334776680-23460-1-git-send-email-nhorman@tuxdriver.com>
Add a command line switch to git-rebase to allow a user the ability to specify
that they want to keep any commits in a series that are empty.
When git-rebase's type is am, then this option will automatically keep any
commit that has a tree object identical to its parent.
This patch changes the default behavior of interactive rebases as well. With
this patch, git-rebase -i will produce a revision set passed to
git-revision-editor, in which empty commits are commented out. Empty commits
may be kept manually by uncommenting them. If the new --keep-empty option is
used in an interactive rebase the empty commits will automatically all be
uncommented in the editor.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
---
Documentation/git-rebase.txt | 4 ++++
git-rebase--am.sh | 19 ++++++++++++++-----
git-rebase--interactive.sh | 33 ++++++++++++++++++++++++++++++---
git-rebase.sh | 5 +++++
4 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 504945c..131c35d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -238,6 +238,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.
will be reset to where it was when the rebase operation was
started.
+--keep-empty::
+ Keep the commits that do not change anything from its
+ parents in the result.
+
--skip::
Restart the rebasing process by skipping the current patch.
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index c815a24..04d8941 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -20,11 +20,20 @@ esac
test -n "$rebase_root" && root_flag=--root
-git format-patch -k --stdout --full-index --ignore-if-in-upstream \
- --src-prefix=a/ --dst-prefix=b/ \
- --no-renames $root_flag "$revisions" |
-git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" &&
-move_to_original_branch
+if test -n "$keep_empty"
+then
+ # we have to do this the hard way. git format-patch completely squashes
+ # empty commits and even if it didn't the format doesn't really lend
+ # itself well to recording empty patches. fortunately, cherry-pick
+ # makes this easy
+ git cherry-pick --allow-empty "$revisions"
+else
+ git format-patch -k --stdout --full-index --ignore-if-in-upstream \
+ --src-prefix=a/ --dst-prefix=b/ \
+ --no-renames $root_flag "$revisions" |
+ git am $git_am_opt --rebasing --resolvemsg="$resolvemsg"
+fi && move_to_original_branch
+
ret=$?
test 0 != $ret -a -d "$state_dir" && write_basic_state
exit $ret
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5812222..b7abe1e 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -167,6 +167,12 @@ has_action () {
sane_grep '^[^#]' "$1" >/dev/null
}
+is_empty_commit() {
+ tree=$(git rev-parse "$1"^{tree})
+ ptree=$(git rev-parse "$1"^^{tree})
+ return $(test "$tree" = "$ptree")
+}
+
# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
# GIT_AUTHOR_DATE exported from the current environment.
do_with_author () {
@@ -191,12 +197,19 @@ git_sequence_editor () {
pick_one () {
ff=--ff
+
case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
case "$force_rebase" in '') ;; ?*) ff= ;; esac
output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
+
+ if is_empty_commit "$sha1"
+ then
+ empty_args="--allow-empty"
+ fi
+
test -d "$rewritten" &&
pick_one_preserving_merges "$@" && return
- output git cherry-pick $ff "$@"
+ output git cherry-pick $empty_args $ff "$@"
}
pick_one_preserving_merges () {
@@ -780,9 +793,17 @@ git rev-list $merges_option --pretty=oneline --abbrev-commit \
sed -n "s/^>//p" |
while read -r shortsha1 rest
do
+
+ if test -z "$keep_empty" && is_empty_commit $shortsha1
+ then
+ comment_out="#"
+ else
+ comment_out=""
+ fi
+
if test t != "$preserve_merges"
then
- printf '%s\n' "pick $shortsha1 $rest" >> "$todo"
+ printf '%s%s\n' "$comment_out" "pick $shortsha1 $rest" >> "$todo"
else
sha1=$(git rev-parse $shortsha1)
if test -z "$rebase_root"
@@ -801,7 +822,7 @@ do
if test f = "$preserve"
then
touch "$rewritten"/$sha1
- printf '%s\n' "pick $shortsha1 $rest" >> "$todo"
+ printf '%s%s\n' "$comment_out" "pick $shortsha1 $rest" >> "$todo"
fi
fi
done
@@ -851,6 +872,12 @@ cat >> "$todo" << EOF
#
EOF
+if test -z "$keep_empty"
+then
+ echo "# Note that empty commits are commented out" >> "$todo"
+fi
+
+
has_action "$todo" ||
die_abort "Nothing to do"
diff --git a/git-rebase.sh b/git-rebase.sh
index 69c1374..24a2840 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -43,6 +43,7 @@ s,strategy=! use the given merge strategy
no-ff! cherry-pick all commits, even if unchanged
m,merge! use merging strategies to rebase
i,interactive! let the user edit the list of commits to rebase
+k,keep-empty preserve empty commits during rebase
f,force-rebase! force rebase even if branch is up to date
X,strategy-option=! pass the argument through to the merge strategy
stat! display a diffstat of what changed upstream
@@ -97,6 +98,7 @@ state_dir=
action=
preserve_merges=
autosquash=
+keep_empty=
test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t
read_basic_state () {
@@ -220,6 +222,9 @@ do
-i)
interactive_rebase=explicit
;;
+ -k)
+ keep_empty=yes
+ ;;
-p)
preserve_merges=t
test -z "$interactive_rebase" && interactive_rebase=implied
--
1.7.7.6
next prev parent reply other threads:[~2012-04-18 19:18 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 19:48 [PATCH 0/4] Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-03-30 19:48 ` [PATCH 1/4] git-cherry-pick: add keep-empty option Neil Horman
2012-03-30 20:34 ` Junio C Hamano
2012-03-30 21:15 ` Jeff King
2012-03-31 12:57 ` Neil Horman
2012-03-30 19:48 ` [PATCH 2/4] git-rebase: add keep_empty flag Neil Horman
2012-03-30 20:43 ` Junio C Hamano
2012-03-31 12:59 ` Neil Horman
2012-03-30 19:48 ` [PATCH 3/4] git-commit-am: Allow automatic rebasing to preserve empty commits Neil Horman
2012-03-30 20:46 ` Junio C Hamano
2012-03-31 13:01 ` Neil Horman
2012-03-30 20:47 ` Junio C Hamano
2012-03-31 13:03 ` Neil Horman
2012-03-30 19:48 ` [PATCH 4/4] git-commit-interactive: Allow " Neil Horman
2012-03-30 20:59 ` Junio C Hamano
2012-03-31 13:11 ` Neil Horman
2012-03-30 20:32 ` [PATCH 0/4] Enhance git-rebases flexibiilty in handling " Junio C Hamano
2012-04-05 19:39 ` [PATCH 0/5] Enhance git-rebases flexibiilty handling empty commits [v2] Neil Horman
2012-04-05 19:39 ` [PATCH 1/5] argv-array: Add argv_array_pop function [v2] Neil Horman
2012-04-05 20:12 ` Junio C Hamano
2012-04-05 23:24 ` Neil Horman
2012-04-06 0:12 ` Neil Horman
2012-04-06 0:19 ` Jeff King
2012-04-06 1:12 ` Neil Horman
2012-04-06 1:20 ` Junio C Hamano
2012-04-06 2:20 ` Jeff King
2012-04-06 4:19 ` Cc tags in the commit message (Re: [PATCH 1/5] argv-array: Add argv_array_pop function [v2]) Jonathan Nieder
2012-04-06 6:55 ` [PATCH 1/5] argv-array: Add argv_array_pop function [v2] Junio C Hamano
2012-04-06 7:33 ` Jeff King
2012-04-06 16:49 ` Junio C Hamano
2012-04-06 18:02 ` Neil Horman
2012-04-05 19:39 ` [PATCH 2/5] git-cherry-pick: add allow-empty option [v2] Neil Horman
2012-04-05 19:39 ` [PATCH 3/5] git-cherry-pick: Add ignore-if-made-empty " Neil Horman
2012-04-05 21:01 ` Junio C Hamano
2012-04-05 23:45 ` Neil Horman
2012-04-06 1:20 ` Junio C Hamano
2012-04-06 18:06 ` Neil Horman
2012-04-06 18:30 ` Johannes Sixt
2012-04-05 19:39 ` [PATCH 4/5] git-cherry-pick: Add test to validate new options [v2] Neil Horman
2012-04-05 19:39 ` [PATCH 5/5] git-rebase: add keep_empty flag [v2] Neil Horman
2012-04-10 15:47 ` [PATCH v3 0/4] Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-04-10 15:47 ` [PATCH v3 1/4] git-cherry-pick: add allow-empty option Neil Horman
2012-04-10 16:45 ` Junio C Hamano
2012-04-10 18:13 ` Neil Horman
2012-04-10 19:32 ` Junio C Hamano
2012-04-10 20:00 ` Neil Horman
2012-04-10 20:32 ` Junio C Hamano
2012-04-10 20:39 ` Neil Horman
2012-04-10 21:09 ` Junio C Hamano
2012-04-11 0:44 ` Neil Horman
2012-04-11 16:52 ` Junio C Hamano
2012-04-11 18:29 ` Neil Horman
2012-04-11 18:50 ` Junio C Hamano
2012-04-11 18:56 ` Neil Horman
2012-04-10 15:47 ` [PATCH v3 2/4] git-cherry-pick: Add keep-redundant-commits option Neil Horman
2012-04-10 17:04 ` Junio C Hamano
2012-04-10 18:25 ` Neil Horman
2012-04-10 15:47 ` [PATCH v3 3/4] git-cherry-pick: Add test to validate new options Neil Horman
2012-04-10 15:47 ` [PATCH v3 4/4] git-rebase: add keep_empty flag Neil Horman
2012-04-13 18:45 ` [PATCH v5 0/4]Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-04-13 18:45 ` [PATCH v5 1/4] git-cherry-pick: add allow-empty option Neil Horman
2012-04-13 18:45 ` [PATCH v5 2/4] git-cherry-pick: Add keep-redundant-commits option Neil Horman
2012-04-15 10:42 ` Clemens Buchacher
2012-04-16 15:38 ` Neil Horman
2012-04-16 22:10 ` Clemens Buchacher
2012-04-17 10:43 ` Neil Horman
2012-04-17 15:42 ` Junio C Hamano
2012-04-17 21:37 ` Clemens Buchacher
2012-04-18 10:41 ` Neil Horman
2012-04-13 18:45 ` [PATCH v5 3/4] git-cherry-pick: Add test to validate new options Neil Horman
2012-04-15 9:39 ` Clemens Buchacher
2012-04-16 11:04 ` Neil Horman
2012-04-16 16:14 ` Neil Horman
2012-04-16 16:35 ` Junio C Hamano
2012-04-16 16:50 ` Neil Horman
2012-04-16 21:42 ` Clemens Buchacher
2012-04-17 10:56 ` Neil Horman
2012-04-17 21:38 ` Clemens Buchacher
2012-04-18 10:48 ` Neil Horman
2012-04-18 18:34 ` Clemens Buchacher
2012-04-13 18:45 ` [PATCH v5 4/4] git-rebase: add keep_empty flag Neil Horman
2012-04-15 9:33 ` Clemens Buchacher
2012-04-16 16:46 ` Neil Horman
2012-04-17 18:20 ` [PATCH v6 0/4] Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-04-17 18:20 ` [PATCH v6 1/4] git-cherry-pick: add allow-empty option Neil Horman
2012-04-17 18:20 ` [PATCH v6 2/4] git-cherry-pick: Add keep-redundant-commits option Neil Horman
2012-04-17 21:45 ` Clemens Buchacher
2012-04-18 10:49 ` Neil Horman
2012-04-17 18:20 ` [PATCH v6 3/4] git-cherry-pick: Add test to validate new options Neil Horman
2012-04-17 18:20 ` [PATCH v6 4/4] git-rebase: add keep_empty flag Neil Horman
2012-04-17 21:47 ` Clemens Buchacher
2012-04-18 10:50 ` Neil Horman
2012-04-18 22:58 ` Junio C Hamano
2012-04-19 13:08 ` Neil Horman
2012-04-19 17:53 ` Junio C Hamano
2012-04-18 19:17 ` [PATCH v7 0/4] Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-04-18 19:17 ` [PATCH v7 1/4] git-cherry-pick: add allow-empty option Neil Horman
2012-04-18 19:17 ` [PATCH v7 2/4] git-cherry-pick: Add keep-redundant-commits option Neil Horman
2012-04-18 22:59 ` Junio C Hamano
2012-04-18 19:17 ` [PATCH v7 3/4] git-cherry-pick: Add test to validate new options Neil Horman
2012-04-18 19:18 ` Neil Horman [this message]
2012-04-19 10:02 ` [PATCH v7 4/4] git-rebase: add keep_empty flag Zbigniew Jędrzejewski-Szmek
2012-04-19 11:49 ` Thomas Rast
2012-04-19 12:19 ` Zbigniew Jędrzejewski-Szmek
2012-04-19 13:12 ` Neil Horman
2012-04-19 18:59 ` Junio C Hamano
2012-04-19 19:05 ` Junio C Hamano
2012-04-20 10:35 ` Neil Horman
2012-04-20 14:36 ` [PATCH v8 0/4] Enhance git-rebases flexibiilty in handling empty commits Neil Horman
2012-04-20 14:36 ` [PATCH v8 1/4] git-cherry-pick: add allow-empty option Neil Horman
2012-04-20 14:36 ` [PATCH v8 2/4] git-cherry-pick: Add keep-redundant-commits option Neil Horman
2012-04-20 19:21 ` Junio C Hamano
2012-04-20 19:56 ` Neil Horman
2012-04-20 14:36 ` [PATCH v8 3/4] git-cherry-pick: Add test to validate new options Neil Horman
2012-04-20 14:36 ` [PATCH v8 4/4] git-rebase: add keep_empty flag Neil Horman
2012-04-25 1:50 ` Junio C Hamano
2012-04-25 10:38 ` Neil Horman
2012-07-18 6:20 ` Martin von Zweigbergk
2012-07-18 7:10 ` Johannes Sixt
2012-07-18 7:16 ` Martin von Zweigbergk
2012-07-18 12:17 ` Neil Horman
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334776680-23460-5-git-send-email-nhorman@tuxdriver.com \
--to=nhorman@tuxdriver.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@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.
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 NNTP newsgroup(s).