builtin/commit.c: extract ignore_non_trailer() helper function

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b97a1d07cbf351e03b266919d1b910afa72eee31..3c6bed9a28f7ff96fa619a9acbfc42e4a2c78828 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -352,8 +352,9 @@ pick_one_preserving_merges () {
                        msg_content="$(commit_message $sha1)"
                        # No point in merging the first parent, that's HEAD
                        new_parents=${new_parents# $first_parent}
+                       merge_args="--no-log --no-ff"
                        if ! do_with_author output eval \
-                       'git merge --no-ff $strategy_args -m "$msg_content" $new_parents'
+                       'git merge $merge_args $strategy_args -m "$msg_content" $new_parents'
                        then
                                printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
                                die_with_patch $sha1 "Error redoing merge $sha1"
@@ -671,7 +672,7 @@ skip_unnecessary_picks () {
                                ;;
                        esac
                        ;;
-               3,#*|3,)
+               3,"$comment_char"*|3,)
                        # copy comments
                        ;;
                *)
@@ -712,7 +713,7 @@ expand_todo_ids() {
 }
 
 collapse_todo_ids() {
-       transform_todo_ids --short=7
+       transform_todo_ids --short
 }
 
 # Rearrange the todo list that has both "pick sha1 msg" and