Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
add tests of commit --squash
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index eb2dff55f81b6726340ce26db93bb161087a4857..a27952d9fdfb517f684b7d304831bf74d0ce237b 100755
(executable)
--- 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