6412757514 · matheusbsbs/matheus-bagliano

Documentation/RelNotes/1.7.10.1.txt

+1 -1

@@ -69,7 +69,7 @@ Fixes since v1.7.10

69 * The 'push to upstream' implementation was broken in some corner

70 cases. "git push $there" without refspec, when the current branch

71 is set to push to a remote different from $there, used to push to

72 - $there using the upstream information to a remote unreleated to

72 + $there using the upstream information to a remote unrelated to

73 $there.

74

75 * Giving "--continue" to a conflicted "rebase -i" session skipped a

Documentation/RelNotes/2.12.0.txt

+1 -1

@@ -264,7 +264,7 @@ notes for details).

264 needed it so far.

265

266 * Git 2.11 had a minor regression in "merge --ff-only" that competed

267 - with another process that simultanously attempted to update the

267 + with another process that simultaneously attempted to update the

268 index. We used to explain what went wrong with an error message,

269 but the new code silently failed. The error message has been

270 resurrected.

Documentation/RelNotes/2.14.0.txt

+1 -1

@@ -54,7 +54,7 @@ UI, Workflows & Features

54 even when the other side hasn't enabled allowTipSHA1InWant.

55

56 * The recently introduced "[includeIf "gitdir:$dir"] path=..."

57 - mechansim has further been taught to take symlinks into account.

57 + mechanism has further been taught to take symlinks into account.

58 The directory "$dir" specified in "gitdir:$dir" may be a symlink to

59 a real location, not something that $(getcwd) may return. In such

60 a case, a realpath of "$dir" is compared with the real path of the

Documentation/git-reset.txt

+1 -1

@@ -294,7 +294,7 @@ $ git reset --keep start <3>

294

295 Split a commit apart into a sequence of commits::

296 +

297 -Suppose that you have created lots of logically separate changes and commited

297 +Suppose that you have created lots of logically separate changes and committed

298 them together. Then, later you decide that it might be better to have each

299 logical chunk associated with its own commit. You can use git reset to rewind

300 history without changing the contents of your local files, and then successively

Documentation/git-submodule.txt

+1 -1

@@ -141,7 +141,7 @@ you can also just use `git submodule update --init` without

141 the explicit 'init' step if you do not intend to customize

142 any submodule locations.

143 +

144 -See the add subcommand for the defintion of default remote.

144 +See the add subcommand for the definition of default remote.

145

146 deinit [-f|--force] (--all|[--] <path>...)::

147 Unregister the given submodules, i.e. remove the whole

abspath.c

+1 -1

@@ -183,7 +183,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,

183

184 /*

185 * use the symlink as the remaining components that

186 - * need to be resloved

186 + * need to be resolved

187 */

188 strbuf_swap(&symlink, &remaining);

189 }

builtin/grep.c

+1 -1

@@ -647,7 +647,7 @@ static int grep_submodule(struct grep_opt *opt, const struct object_id *oid,

647 return 0;

648 if (!is_submodule_populated_gently(path, NULL)) {

649 /*

650 - * If searching history, check for the presense of the

650 + * If searching history, check for the presence of the

651 * submodule's gitdir before skipping the submodule.

652 */

653 if (oid) {

compat/regex/regexec.c

+1 -1

@@ -4102,7 +4102,7 @@ extend_buffers (re_match_context_t *mctx)

4102 if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))

4103 return REG_ESPACE;

4104

4105 - /* Double the lengthes of the buffers. */

4105 + /* Double the lengths of the buffers. */

4106 ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);

4107 if (BE (ret != REG_NOERROR, 0))

4108 return ret;

contrib/hooks/multimail/git_multimail.py

+1 -1

@@ -2964,7 +2964,7 @@ class StaticRecipientsEnvironmentMixin(Environment):

2964

2965

2966 class CLIRecipientsEnvironmentMixin(Environment):

2967 - """Mixin storing recipients information comming from the

2967 + """Mixin storing recipients information coming from the

2968 command-line."""

2969

2970 def __init__(self, cli_recipients=None, **kw):

contrib/mw-to-git/git-remote-mediawiki.perl

+1 -1

@@ -857,7 +857,7 @@ sub mw_import_revids {

857

858 my $n = 0;

859 my $n_actual = 0;

860 - my $last_timestamp = 0; # Placeholer in case $rev->timestamp is undefined

860 + my $last_timestamp = 0; # Placeholder in case $rev->timestamp is undefined

861

862 foreach my $pagerevid (@{$revision_ids}) {

863 # Count page even if we skip it, since we display

contrib/mw-to-git/t/README

+1 -1

@@ -121,4 +121,4 @@ How to write a new test

121

122 Please, follow the standards given by git. See git/t/README.

123 New file should be named as t936[0-9]-*.sh.

124 -Be sure to reset your wiki regulary with the function `wiki_reset`.

124 +Be sure to reset your wiki regularly with the function `wiki_reset`.

gitweb/gitweb.perl

+2 -2

@@ -3125,7 +3125,7 @@ sub git_get_projects_list {

3125 return @list;

3126 }

3127

3128 -# written with help of Tree::Trie module (Perl Artistic License, GPL compatibile)

3128 +# written with help of Tree::Trie module (Perl Artistic License, GPL compatible)

3129 # as side effects it sets 'forks' field to list of forks for forked projects

3130 sub filter_forks_from_projects_list {

3131 my $projects = shift;

@@ -4376,7 +4376,7 @@ sub git_print_page_nav {

4376 "</div>\n";

4377 }

4378

4379 -# returns a submenu for the nagivation of the refs views (tags, heads,

4379 +# returns a submenu for the navigation of the refs views (tags, heads,

4380 # remotes) with the current view disabled and the remotes view only

4381 # available if the feature is enabled

4382 sub format_ref_views {

mailinfo.c

+8 -8

@@ -58,17 +58,17 @@ static void parse_bogus_from(struct mailinfo *mi, const struct strbuf *line)

58 static const char *unquote_comment(struct strbuf *outbuf, const char *in)

59 {

60 int c;

61 - int take_next_litterally = 0;

61 + int take_next_literally = 0;

62

63 strbuf_addch(outbuf, '(');

64

65 while ((c = *in++) != 0) {

66 - if (take_next_litterally == 1) {

67 - take_next_litterally = 0;

66 + if (take_next_literally == 1) {

67 + take_next_literally = 0;

68 } else {

69 switch (c) {

70 case '\\':

71 - take_next_litterally = 1;

71 + take_next_literally = 1;

72 continue;

73 case '(':

74 in = unquote_comment(outbuf, in);

@@ -88,15 +88,15 @@ static const char *unquote_comment(struct strbuf *outbuf, const char *in)

88 static const char *unquote_quoted_string(struct strbuf *outbuf, const char *in)

89 {

90 int c;

91 - int take_next_litterally = 0;

91 + int take_next_literally = 0;

92

93 while ((c = *in++) != 0) {

94 - if (take_next_litterally == 1) {

95 - take_next_litterally = 0;

94 + if (take_next_literally == 1) {

95 + take_next_literally = 0;

96 } else {

97 switch (c) {

98 case '\\':

99 - take_next_litterally = 1;

99 + take_next_literally = 1;

100 continue;

101 case '"':

102 return in;

pathspec.c

+1 -1

@@ -606,7 +606,7 @@ void parse_pathspec(struct pathspec *pathspec,

606

607 /*

608 * If everything is an exclude pattern, add one positive pattern

609 - * that matches everyting. We allocated an extra one for this.

609 + * that matches everything. We allocated an extra one for this.

610 */

611 if (nr_exclude == n) {

612 int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;

perl/Git/I18N.pm

+1 -1

@@ -74,7 +74,7 @@ Git::I18N - Perl interface to Git's Gettext localizations

74

75 printf __("The following error occurred: %s\n"), $error;

76

77 - printf __n("commited %d file\n", "commited %d files\n", $files), $files;

77 + printf __n("committed %d file\n", "committed %d files\n", $files), $files;

78

79

80 =head1 DESCRIPTION

refs.h

+2 -2

@@ -574,7 +574,7 @@ int ref_transaction_verify(struct ref_transaction *transaction,

574 #define TRANSACTION_GENERIC_ERROR -2

575

576 /*

577 - * Perform the preparatory stages of commiting `transaction`. Acquire

577 + * Perform the preparatory stages of committing `transaction`. Acquire

578 * any needed locks, check preconditions, etc.; basically, do as much

579 * as possible to ensure that the transaction will be able to go

580 * through, stopping just short of making any irrevocable or

@@ -586,7 +586,7 @@ int ref_transaction_verify(struct ref_transaction *transaction,

586 * On failure, abort the transaction, write an error message to `err`,

587 * and return one of the `TRANSACTION_*` constants.

588 *

589 - * Callers who don't need such fine-grained control over commiting

589 + * Callers who don't need such fine-grained control over committing

590 * reference transactions should just call `ref_transaction_commit()`.

591 */

592 int ref_transaction_prepare(struct ref_transaction *transaction,

send-pack.c

+1 -1

@@ -133,7 +133,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc

133 * For a normal non-zero exit, we assume pack-objects wrote

134 * something useful to stderr. For death by signal, though,

135 * we should mention it to the user. The exception is SIGPIPE

136 - * (141), because that's a normal occurence if the remote end

136 + * (141), because that's a normal occurrence if the remote end

137 * hangs up (and we'll report that by trying to read the unpack

138 * status).

139 */

sha1dc/sha1.c

+1 -1

@@ -918,7 +918,7 @@ static void sha1recompress_fast_ ## t (uint32_t ihvin[5], uint32_t ihvout[5], co

918

919 #ifdef _MSC_VER

920 #pragma warning(push)

921 -#pragma warning(disable: 4127) /* Complier complains about the checks in the above macro being constant. */

921 +#pragma warning(disable: 4127) /* Compiler complains about the checks in the above macro being constant. */

922 #endif

923

924 #ifdef DOSTORESTATE0

submodule.c

+2 -2

@@ -846,9 +846,9 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)

846 int has_commit = 1;

847

848 /*

849 - * Perform a cheap, but incorrect check for the existance of 'commits'.

849 + * Perform a cheap, but incorrect check for the existence of 'commits'.

850 * This is done by adding the submodule's object store to the in-core

851 - * object store, and then querying for each commit's existance. If we

851 + * object store, and then querying for each commit's existence. If we

852 * do not have the commit object anywhere, there is no chance we have

853 * it in the object store of the correct submodule and have it

854 * reachable from a ref, so we can fail early without spawning rev-list

t/helper/test-strcmp-offset.c

+1 -1

@@ -11,7 +11,7 @@ int cmd_main(int argc, const char **argv)

11 result = strcmp_offset(argv[1], argv[2], &offset);

12

13 /*

14 - * Because differnt CRTs behave differently, only rely on signs

14 + * Because different CRTs behave differently, only rely on signs

15 * of the result values.

16 */

17 result = (result < 0 ? -1 :

t/t2203-add-intent.sh

+3 -3

@@ -129,10 +129,10 @@ test_expect_success 'cache-tree does skip dir that becomes empty' '

129 )

130 '

131

132 -test_expect_success 'commit: ita entries ignored in empty intial commit check' '

133 - git init empty-intial-commit &&

132 +test_expect_success 'commit: ita entries ignored in empty initial commit check' '

133 + git init empty-initial-commit &&

134 (

135 - cd empty-intial-commit &&

135 + cd empty-initial-commit &&

136 : >one &&

137 git add -N one &&

138 test_must_fail git commit -m nothing-new-here

t/t3070-wildmatch.sh

+1 -1

@@ -235,7 +235,7 @@ pathmatch 1 abcXdefXghi '*X*i'

235 pathmatch 1 ab/cXd/efXg/hi '*/*X*/*/*i'

236 pathmatch 1 ab/cXd/efXg/hi '*Xg*i'

237

238 -# Case-sensitivy features

238 +# Case-sensitivity features

239 match 0 x 'a' '[A-Z]'

240 match 1 x 'A' '[A-Z]'

241 match 0 x 'A' '[a-z]'

t/t4213-log-tabexpand.sh

+1 -1

@@ -37,7 +37,7 @@ count_expand ()

37

38 # Prefix the output with the command line arguments, and

39 # replace SP with a dot both in the expecte and actual output

40 - # so that test_cmp would show the differene together with the

40 + # so that test_cmp would show the difference together with the

41 # breakage in a way easier to consume by the debugging user.

42 {

43 echo "git show -s $*"

t/t5614-clone-submodules-shallow.sh

+2 -2

@@ -71,7 +71,7 @@ test_expect_success 'clone follows shallow recommendation' '

71 test_when_finished "rm -rf super_clone" &&

72 git config -f .gitmodules submodule.sub.shallow true &&

73 git add .gitmodules &&

74 - git commit -m "recommed shallow for sub" &&

74 + git commit -m "recommend shallow for sub" &&

75 git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&

76 (

77 cd super_clone &&

@@ -105,7 +105,7 @@ test_expect_success 'clone follows non shallow recommendation' '

105 test_when_finished "rm -rf super_clone" &&

106 git config -f .gitmodules submodule.sub.shallow false &&

107 git add .gitmodules &&

108 - git commit -m "recommed non shallow for sub" &&

108 + git commit -m "recommend non shallow for sub" &&

109 git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&

110 (

111 cd super_clone &&

t/t6120-describe.sh

+1 -1

@@ -244,7 +244,7 @@ test_expect_success 'setup and absorb a submodule' '

244 test_cmp expect out

245 '

246

247 -test_expect_success 'describe chokes on severly broken submodules' '

247 +test_expect_success 'describe chokes on severely broken submodules' '

248 mv .git/modules/sub1/ .git/modules/sub_moved &&

249 test_must_fail git describe --dirty

250 '

t/t7412-submodule-absorbgitdirs.sh

+1 -1

@@ -33,7 +33,7 @@ test_expect_success 'absorb the git dir' '

33 test_cmp expect.2 actual.2

34 '

35

36 -test_expect_success 'absorbing does not fail for deinitalized submodules' '

36 +test_expect_success 'absorbing does not fail for deinitialized submodules' '

37 test_when_finished "git submodule update --init" &&

38 git submodule deinit --all &&

39 git submodule absorbgitdirs &&

t/t7413-submodule-is-active.sh

+1 -1

@@ -2,7 +2,7 @@

2

3 test_description='Test submodule--helper is-active

4

5 -This test verifies that `git submodue--helper is-active` correclty identifies

5 +This test verifies that `git submodue--helper is-active` correctly identifies

6 submodules which are "active" and interesting to the user.

7 '

8

t/t9300-fast-import.sh

+1 -1

@@ -2822,7 +2822,7 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' '

2822 #

2823 # notemodify, three ways to say dataref

2824 #

2825 -test_expect_success 'S: notemodify with garabge after mark dataref must fail' '

2825 +test_expect_success 'S: notemodify with garbage after mark dataref must fail' '

2826 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&

2827 commit refs/heads/S

2828 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE

Spelling fixes