diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
| commit | e4663556cfa0d85e7a80d731b07d4058335761ff (patch) | |
| tree | 141596683079fc76435465f3de992a7ddd51abe0 /git-rebase.sh | |
| parent | 4ef927a995d9b54b37e4cff8ed7cd92764d4dacd (diff) | |
| parent | 92c62a3f4f93432c0c82e3031a9e64e03ba290f7 (diff) | |
| download | git-e4663556cfa0d85e7a80d731b07d4058335761ff.tar.gz git-e4663556cfa0d85e7a80d731b07d4058335761ff.tar.xz | |
Merge branch 'rr/needs-clean-work-tree'
* rr/needs-clean-work-tree:
Porcelain scripts: Rewrite cryptic "needs update" error message
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 10a238ae3..0e9d52a50 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -412,19 +412,7 @@ else fi 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-files --name-status -r --ignore-submodules -- >&2 - exit 1 -fi -diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) -case "$diff" in -?*) echo >&2 "cannot rebase: your index contains uncommitted changes" - echo >&2 "$diff" - exit 1 - ;; -esac +require_clean_work_tree "rebase" "Please commit or stash them." if test -z "$rebase_root" then |