diff options
Diffstat (limited to 'git-rebase-script')
| -rwxr-xr-x | git-rebase-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script index 5bb3bd97a..a335b9917 100755 --- a/git-rebase-script +++ b/git-rebase-script @@ -27,7 +27,9 @@ esac upstream=`git-rev-parse --verify "$1"` && ours=`git-rev-parse --verify "$ours_symbolic"` || exit -test "$(git-diff-cache --cached "$ours")" = "" || +different1=$(git-diff-cache --name-only --cached "$ours") && +different2=$(git-diff-cache --name-only "$ours") && +test "$different1$different2" = "" || die "Your working tree does not match $ours_symbolic." git-read-tree -m -u $ours $upstream && |