Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > Either way, it should simply be spelled as > > is_empty_commit() { > tree=$(git rev-parse "$1"^{tree}) > ptree=$(git rev-parse "$1"^^{tree}) > test "$tree" = "$ptree" > } Thanks; will squash in something like this: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 82042b1..8fe304f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -168,9 +168,10 @@ has_action () { } is_empty_commit() { - tree=$(git rev-parse "$1"^{tree}) - ptree=$(git rev-parse "$1"^^{tree}) - return $(test "$tree" = "$ptree") + tree=$(git rev-parse "$1"^{tree} 2>/dev/null) && + ptree=$(git rev-parse "$1"^^{tree} 2>/dev/null) || + die "$1: not a commit that can be picked" + test "$tree" = "$ptree" } # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html