git-rebase -i: add command "drop" to remove a commit

Instead of removing a line to remove the commit, you can use the
command "drop" (just like "pick" or "edit"). It has the same effect as
deleting the line (removing the commit) except that you keep a visual
trace of your actions, allowing a better control and reducing the
possibility of removing a commit by mistake.

Signed-off-by: Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 1d01baa5fcfd03370953e8311b9c7bf3b49e2f4e..34bd070af8cfea24e9189cc8fc7d6c691dc7f753 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -514,6 +514,9 @@ rebasing.
 If you just want to edit the commit message for a commit, replace the
 command "pick" with the command "reword".
 
 If you just want to edit the commit message for a commit, replace the
 command "pick" with the command "reword".
 

+To drop a commit, replace the command "pick" with "drop", or just
+delete the matching line.
+

 If you want to fold two or more commits into one, replace the command
 "pick" for the second and subsequent commits with "squash" or "fixup".
 If the commits had different authors, the folded commit will be
 If you want to fold two or more commits into one, replace the command
 "pick" for the second and subsequent commits with "squash" or "fixup".
 If the commits had different authors, the folded commit will be

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index bab0dccc04d85215223c30597659f23cf8edff32..2882276643e5b5dc3896a1af6e6899fee4f9a974 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -152,6 +152,7 @@ Commands:
  s, squash = use commit, but meld into previous commit
  f, fixup = like "squash", but discard this commit's log message
  x, exec = run command (the rest of the line) using shell
  s, squash = use commit, but meld into previous commit
  f, fixup = like "squash", but discard this commit's log message
  x, exec = run command (the rest of the line) using shell

+ d, drop = remove commit

 
 These lines can be re-ordered; they are executed from top to bottom.
 
 
 These lines can be re-ordered; they are executed from top to bottom.
 


@@ -505,7 +506,7 @@ do_next () {
        rm -f "$msg" "$author_script" "$amend" || exit
        read -r command sha1 rest < "$todo"
        case "$command" in
        rm -f "$msg" "$author_script" "$amend" || exit
        read -r command sha1 rest < "$todo"
        case "$command" in

-       "$comment_char"*|''|noop)
+       "$comment_char"*|''|noop|drop|d)

                mark_action_done
                ;;
        pick|p)
                mark_action_done
                ;;
        pick|p)

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 6bd252212a7eb901dded2a460eebe92aa3b6212b..fdbc9007d07e8dfe06a7459f40bde69e6bd94bd7 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -14,7 +14,7 @@
 #       specified line.
 #
 #   "<cmd> <lineno>" -- add a line with the specified command
 #       specified line.
 #
 #   "<cmd> <lineno>" -- add a line with the specified command

-#       ("squash", "fixup", "edit", or "reword") and the SHA1 taken
+#       ("squash", "fixup", "edit", "reword" or "drop") and the SHA1 taken

 #       from the specified line.
 #
 #   "exec_cmd_with_args" -- add an "exec cmd with args" line.
 #       from the specified line.
 #
 #   "exec_cmd_with_args" -- add an "exec cmd with args" line.


@@ -46,7 +46,7 @@ set_fake_editor () {
        action=pick
        for line in $FAKE_LINES; do
                case $line in
        action=pick
        for line in $FAKE_LINES; do
                case $line in

-               squash|fixup|edit|reword)
+               squash|fixup|edit|reword|drop)

                        action="$line";;
                exec*)
                        echo "$line" | sed 's/_/ /g' >> "$1";;
                        action="$line";;
                exec*)
                        echo "$line" | sed 's/_/ /g' >> "$1";;

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index ac429a0bbbbeb95f96336aa203a5d9726ed6eb1d..3d059e5c09a20e237635e3d74d9fd91603ac5541 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1102,4 +1102,22 @@ test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
        test $(git cat-file commit HEAD | sed -ne \$p) = I
 '
 
        test $(git cat-file commit HEAD | sed -ne \$p) = I
 '
 

+rebase_setup_and_clean () {
+       test_when_finished "
+               git checkout master &&
+               test_might_fail git branch -D $1 &&
+               test_might_fail git rebase --abort
+       " &&
+       git checkout -b $1 master
+}
+
+test_expect_success 'drop' '
+       rebase_setup_and_clean drop-test &&
+       set_fake_editor &&
+       FAKE_LINES="1 drop 2 3 drop 4 5" git rebase -i --root &&
+       test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+       test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+       test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
+'
+

 test_done
 test_done