small misspellings fixes

small misspellings fixes

[Veres Lajos]

Hi,

I am trying to convert this pull request:
https://github.com/git/git/pull/42
to a proper patch email
(Sorry If I miss something about the process.)

I found a few trivial misspellings.

Signed-off-by: Veres Lajos <vlajos@gmail.com>
---
diff --git a/git-p4.py b/git-p4.py
index 911bbce..88fcf23 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3168,7 +3168,7 @@ class P4Rebase(Command):
         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.");
         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()
         if len(upstream) == 0:
diff --git a/git-svn.perl b/git-svn.perl
index d070de0..4e8275f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1246,7 +1246,7 @@ sub cmd_rebase {
 		return;
 	}
 	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');
 		exit 1;
 	}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 2f70433..460d8eb 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '

 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 &&
 	test_must_fail git merge --squash --ff-only c2
 '

Re: small misspellings fixes

[Ramkumar Ramachandra]

Veres Lajos wrote:
> Subject: small misspelling fixes

Good.

> I am trying to convert this pull request:
> https://github.com/git/git/pull/42
> to a proper patch email
> (Sorry If I miss something about the process.)

This does not belong in the commit message: you don't want this to be
shown when someone is reading 'git log' output, do you?  Put such
comments under the "--" line after the signoff, so it'll be ignored by
git am.

Thanks.

small misspellings fixes

[Veres Lajos]

small misspellings fixes

Signed-off-by: Veres Lajos <vlajos@gmail.com>
---
diff --git a/git-p4.py b/git-p4.py
index 911bbce..88fcf23 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3168,7 +3168,7 @@ class P4Rebase(Command):
         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.");
         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()
         if len(upstream) == 0:
diff --git a/git-svn.perl b/git-svn.perl
index d070de0..4e8275f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1246,7 +1246,7 @@ sub cmd_rebase {
 		return;
 	}
 	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');
 		exit 1;
 	}
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 2f70433..460d8eb 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '

 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 &&
 	test_must_fail git merge --squash --ff-only c2
 '
-- 
Hi,

I am trying to convert this pull request:
https://github.com/git/git/pull/42
to a proper patch email
(Sorry If I miss something about the process.)
-- 
Veres Lajos
vlajos@gmail.com
+36 20 438 5909

Re: small misspellings fixes

[Matthieu Moy]

Veres Lajos <vlajos@gmail.com> writes:

> I am trying to convert this pull request:
> https://github.com/git/git/pull/42
> to a proper patch email

Use "git format-patch" and/or "git send-email" to get the proper
formatting.

> (Sorry If I miss something about the process.)

Yes, your patch doesn't have exactly the right format, and you should
have Cc-ed Junio (see Documentation/SubmittingPatches in Git's source
tree).

Other than that, the content of the patch looks good (and actually, at
least one of the typos is mine :-( ). Can you resend?

Thanks,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: small misspellings fixes

[Junio C Hamano]

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Veres Lajos <vlajos@gmail.com> writes:
>
>> I am trying to convert this pull request:
>> https://github.com/git/git/pull/42
>> to a proper patch email
>
> Use "git format-patch" and/or "git send-email" to get the proper
> formatting.
>
>> (Sorry If I miss something about the process.)
>
> Yes, your patch doesn't have exactly the right format, and you should
> have Cc-ed Junio (see Documentation/SubmittingPatches in Git's source
> tree).
>
> Other than that, the content of the patch looks good (and actually, at
> least one of the typos is mine :-( ). Can you resend?

Repeating the subject in the body is unnecessary.

I'll pick it up from here and will fix up.  No need to resend.

Thanks.