mirror of
https://github.com/git/git.git
synced 2024-06-08 01:56:14 +02:00
random typofixes (committed missing a 't', successful missing an 's')
Signed-off-by: Veres Lajos <vlajos@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b3b8ceb48b
commit
f7e604ed39
|
@ -3153,7 +3153,7 @@ def rebase(self):
|
||||||
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:
|
||||||
|
|
|
@ -1220,7 +1220,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
|
||||||
'
|
'
|
||||||
|
|
Loading…
Reference in New Issue