builtin-commit.c: fix logic to omit empty line before existing footers

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 2315d95a9fb28e15190461a94a43e28e57fbe6c3..6ec155cf03c98f2e075f298039037d0e099311b1 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -387,7 +387,7 @@ fi
 # The tree must be really really clean.
 if ! git update-index --ignore-submodules --refresh > /dev/null; then
        echo >&2 "cannot rebase: you have unstaged changes"
-       git diff --name-status -r --ignore-submodules -- >&2
+       git diff-files --name-status -r --ignore-submodules -- >&2
        exit 1
 fi
 diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)