Merge branch 'vl/typofix' into maint

* vl/typofix:
  random typofixes (committed missing a 't', successful missing an 's')
This commit is contained in:
Junio C Hamano 2013-07-19 10:42:57 -07:00
Родитель 0b57758c35 f7e604ed39
Коммит e6d6911941
3 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -3168,7 +3168,7 @@ class P4Rebase(Command):
if os.system("git update-index --refresh") != 0: if os.system("git update-index --refresh") != 0:
die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash."); die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.");
if len(read_pipe("git diff-index HEAD --")) > 0: if len(read_pipe("git diff-index HEAD --")) > 0:
die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash."); die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
[upstream, settings] = findUpstreamBranchPoint() [upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0: if len(upstream) == 0:

Просмотреть файл

@ -1246,7 +1246,7 @@ sub cmd_rebase {
return; return;
} }
if (command(qw/diff-index HEAD --/)) { if (command(qw/diff-index HEAD --/)) {
print STDERR "Cannot rebase with uncommited changes:\n"; print STDERR "Cannot rebase with uncommitted changes:\n";
command_noisy('status'); command_noisy('status');
exit 1; exit 1;
} }

Просмотреть файл

@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '
test_debug 'git log --graph --decorate --oneline --all' test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' ' test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
git reset --hard c1 && git reset --hard c1 &&
test_must_fail git merge --squash --ff-only c2 test_must_fail git merge --squash --ff-only c2
' '