fast-import: Improve robustness when D->F changes provided in wrong order

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b817c4a76e54c31f5a21d8196729f0cfb31997cf..436b7f5977c05c347debc12130f822af482c03e3 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -565,6 +565,7 @@ do_next () {
                        git diff-tree --stat $(cat "$DOTEST"/head)..HEAD
        } &&
        {
+               test -s "$REWRITTEN_LIST" &&
                git notes copy --for-rewrite=rebase < "$REWRITTEN_LIST" ||
                true # we don't care if this copying failed
        } &&