diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-18 23:30:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-18 23:30:36 (GMT) |
| commit | a8055f8a8ed10a6d3272382f38a0808427ab4921 (patch) | |
| tree | 4f300ddf0b04d00aa651b53595647c4c47f51c24 | |
| parent | d571c2be99cb4ab96ff70c62c31d587271db9567 (diff) | |
| download | git-a8055f8a8ed10a6d3272382f38a0808427ab4921.zip git-a8055f8a8ed10a6d3272382f38a0808427ab4921.tar.gz git-a8055f8a8ed10a6d3272382f38a0808427ab4921.tar.bz2 | |
Also make git-rebase-script stricter about dirty working tree.
Otherwise the first commit rebase makes could include whatever
dirty state the original working tree had.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -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 5bb3bd9..a335b99 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 && |