Re: [PATCH] maintenance: fix typos

[Junio C Hamano <gitster@pobox.com>]

Samanta Navarro <ferivoz@riseup.net> writes:

[continuing from <xmqqmt75lh2r.fsf@gitster.g>; this is second part]

Starting from here

> diff --git a/bloom.h b/bloom.h
> index adde6dfe21..83eb989d85 100644
> --- a/bloom.h
> +++ b/bloom.h
> @@ -15,7 +15,7 @@ struct bloom_filter_settings {
> -	 * number of bit positions tht cumulatively
> +	 * number of bit positions that cumulatively

... down to here ...

> diff --git a/contrib/coccinelle/unused.cocci b/contrib/coccinelle/unused.cocci
> index d84046f82e..142a5a1f02 100644
> --- a/contrib/coccinelle/unused.cocci
> +++ b/contrib/coccinelle/unused.cocci
> @@ -1,4 +1,4 @@
> -// This rule finds sequences of "unused" declerations and uses of a
> +// This rule finds sequences of "unused" declarations and uses of a

look all good.

> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index dc95c34cc8..f414639f52 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -3330,7 +3330,7 @@ _git_worktree ()
>  		# Here we are not completing an --option, it's either the
>  		# path or a ref.
>  		case "$prev" in
> -		-b|-B)	# Complete refs for branch to be created/reseted.
> +		-b|-B)	# Complete refs for branch to be created/resetted.

Past Participle of verb "reset" is "reset", not "resetted", so

	... to be created or reset.

I think.

Restarting from here ...

> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index 10c9c87839..8c4e2c0460 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -921,7 +921,7 @@ cmd_split () {
> -		die "fatal: you must provide exactly one revision, and optionnally a repository.  Got: '$*'"
> +		die "fatal: you must provide exactly one revision, and optionally a repository.  Got: '$*'"

... down to here ..

> diff --git a/fsmonitor.c b/fsmonitor.c
> index 08af00c738..d48e089c9b 100644
> --- a/fsmonitor.c
> +++ b/fsmonitor.c
> @@ -215,7 +215,7 @@ static void fsmonitor_refresh_callback(struct index_s
> -		 * We need to remove the traling "/" from the path
> +		 * We need to remove the trailing "/" from the path

look all good.

> diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
> index f43d84e54f..68c999a9be 100644
> --- a/git-gui/lib/themed.tcl
> +++ b/git-gui/lib/themed.tcl
> @@ -4,7 +4,7 @@
> -	# Preffered way to set widget colors is using add_option.
> +	# Preferred way to set widget colors is using add_option.

Good, but patches to this part of the tree should be against

    https://github.com/prati0100/git-gui.git

not my tree (they are rooted differently).

Restarting again from here ...

> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index c68f49454c..652d0b2dd3 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -612,7 +612,7 @@ python_conf() {
> -	# This asumes that python is in user's $PATH
> +	# This assumes that python is in user's $PATH

... down to here ...

> diff --git a/gpg-interface.c b/gpg-interface.c
> index f877a1ea56..89c2ec08be 100644
> --- a/gpg-interface.c
> +++ b/gpg-interface.c
> @@ -379,7 +379,7 @@ static void parse_ssh_output(struct signature_check *sigc)
> -	 * string.  By finding the last occurence of " with ", we can
> +	 * string.  By finding the last occurrence of " with ", we can

all look good.  I'd stop here for now.

Thanks.