X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-rebase--interactive.sh;h=a27952d9fdfb517f684b7d304831bf74d0ce237b;hb=2794ad524462c4e2ecd4573d650e7b4f8da89a5d;hp=eb2dff55f81b6726340ce26db93bb161087a4857;hpb=c6babe5762f2f4e0d57e08c1362e05053348919a;p=git.git diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index eb2dff55f..a27952d9f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -626,7 +626,7 @@ skip_unnecessary_picks () { case "$fd,$command" in 3,pick|3,p) # pick a commit whose parent is current $ONTO -> skip - sha1=$(printf '%s' "$rest" | cut -d ' ' -f 1) + sha1=${rest%% *} case "$(git rev-parse --verify --quiet "$sha1"^)" in "$ONTO"*) ONTO=$sha1