diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:50 -0700 |
commit | f8a3fd28fd9e61852f5944335e7338c52c8c5abd (patch) | |
tree | 5bf4dc994ba91b67bf5df68c01ebc6a2ee1cd1e2 /git-rebase--interactive.sh | |
parent | Merge branch 'rt/rebase-p-no-merge-summary' into maint (diff) | |
parent | rebase -i: fix short SHA-1 collision (diff) | |
download | tgif-f8a3fd28fd9e61852f5944335e7338c52c8c5abd.tar.xz |
Merge branch 'es/rebase-i-no-abbrev' into maint
* es/rebase-i-no-abbrev:
rebase -i: fix short SHA-1 collision
t3404: rebase -i: demonstrate short SHA-1 collision
t3404: make tests more self-contained
Conflicts:
t/t3404-rebase-interactive.sh
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r-- | git-rebase--interactive.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b8245cd3fa..10bf318d0d 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -690,6 +690,32 @@ skip_unnecessary_picks () { die "Could not skip unnecessary pick commands" } +transform_todo_ids () { + while read -r command rest + do + case "$command" in + "$comment_char"* | exec) + # Be careful for oddball commands like 'exec' + # that do not have a SHA-1 at the beginning of $rest. + ;; + *) + sha1=$(git rev-parse --verify --quiet "$@" ${rest%% *}) && + rest="$sha1 ${rest#* }" + ;; + esac + printf '%s\n' "$command${rest:+ }$rest" + done <"$todo" >"$todo.new" && + mv -f "$todo.new" "$todo" +} + +expand_todo_ids() { + transform_todo_ids +} + +collapse_todo_ids() { + transform_todo_ids --short=7 +} + # Rearrange the todo list that has both "pick sha1 msg" and # "pick sha1 fixup!/squash! msg" appears in it so that the latter # comes immediately after the former, and change "pick" to @@ -842,6 +868,7 @@ skip) edit-todo) git stripspace --strip-comments <"$todo" >"$todo".new mv -f "$todo".new "$todo" + collapse_todo_ids append_todo_help git stripspace --comment-lines >>"$todo" <<\EOF @@ -853,6 +880,7 @@ EOF git_sequence_editor "$todo" || die "Could not execute editor" + expand_todo_ids exit ;; @@ -1009,6 +1037,8 @@ git_sequence_editor "$todo" || has_action "$todo" || die_abort "Nothing to do" +expand_todo_ids + test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" |