summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-29 01:06:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-29 01:06:57 (GMT)
commitd25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch)
tree88de4825ce11d7eaed4719b0b9db1d0e649f9107 /git-rebase--interactive.sh
parentb3a4f8586b4ffa6c896cf0afb2ea49d64faf81ad (diff)
parent38762c47d6442dc0ce0f45533f9151877c485337 (diff)
downloadgit-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.zip
git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.gz
git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.bz2
Merge branch 'maint'
* maint: scripts: do not get confused with HEAD in work tree Improve description of git-branch -d and -D in man page.
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index bf44b6a..e9cd6fd 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -53,7 +53,7 @@ require_clean_work_tree () {
git rev-parse --verify HEAD > /dev/null &&
git update-index --refresh &&
git diff-files --quiet &&
- git diff-index --cached --quiet HEAD ||
+ git diff-index --cached --quiet HEAD -- ||
die "Working tree is dirty"
}
@@ -356,7 +356,7 @@ do
git rev-parse --verify HEAD > /dev/null &&
git update-index --refresh &&
git diff-files --quiet &&
- ! git diff-index --cached --quiet HEAD &&
+ ! git diff-index --cached --quiet HEAD -- &&
. "$DOTEST"/author-script && {
test ! -f "$DOTEST"/amend || git reset --soft HEAD^
} &&