On 11-05-21 1:51 AM, Andrew Wong wrote:
preserve=t for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-) do - if test -f "$rewritten"/$p -a \( $p != $onto -o $sha1 = $first_after_upstream \) + if test -f "$rewritten"/$p&& ( + test $p != $onto || + expr "$commits_after_upstream" ":" ".*$sha1.*" + ) then preserve=f fi
Actually, I think this change might be effectively the same as removing both of the OR-conditions, which leaves only the "test -f" condition. That means commits are never skipped.
I guess this goes back to my first response to this issue. What kind of commits are skipped by the changes introduced in commit d80d6bc146232d81f1bb4bc58e5d89263fd228d4 ?
-- 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