comments: fix misuses of "nor"

Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index dddaf4f287cf5cd5e99ad2587d53ba7582c51e29..fc02788184a690ecc1862109eeec2c02c0062b2f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ all::
 #
 # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
 #
 #
 # Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
 #

-# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
+# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.

 #
 # Define NO_UINTMAX_T if you don't have uintmax_t.
 #
 #
 # Define NO_UINTMAX_T if you don't have uintmax_t.
 #

diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986226ccb7fa06b08bacba6269b8834e8dd6..6013e1913c05a57ed935a17504ebe079f46cc8ad 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
                return error(_("cannot open %s: %s"), namebuf, strerror(errno));
 
        /* Normal git tools never deal with .rej, so do not pretend
                return error(_("cannot open %s: %s"), namebuf, strerror(errno));
 
        /* Normal git tools never deal with .rej, so do not pretend

-        * this is a git patch by saying --git nor give extended
+        * this is a git patch by saying --git or giving extended

         * headers.  While at it, maybe please "kompare" that wants
         * the trailing TAB and some garbage at the end of line ;-).
         */
         * headers.  While at it, maybe please "kompare" that wants
         * the trailing TAB and some garbage at the end of line ;-).
         */

diff --git a/builtin/checkout.c b/builtin/checkout.c
index ada51fa70ff59b10fd79168a4377d923638591e9..7f37d1a2453be5b318c9e9a746cddec78bc28fa7 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
         *       between A and B, A...B names that merge base.
         *
         *   (b) If <something> is _not_ a commit, either "--" is present
         *       between A and B, A...B names that merge base.
         *
         *   (b) If <something> is _not_ a commit, either "--" is present

-        *       or <something> is not a path, no -t nor -b was given, and
+        *       or <something> is not a path, no -t or -b was given, and

         *       and there is a tracking branch whose name is <something>
         *       in one and only one remote, then this is a short-hand to
         *       fork local <something> from that remote-tracking branch.
         *       and there is a tracking branch whose name is <something>
         *       in one and only one remote, then this is a short-hand to
         *       fork local <something> from that remote-tracking branch.

diff --git a/builtin/log.c b/builtin/log.c
index b97373da3b2687e18b5eba96382049382d1536fd..39e883635279ad21f3ddd7b224f484b9b04700b0 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *
                /* There was no "-m" on the command line */
                rev->ignore_merges = 0;
                if (!rev->first_parent_only && !rev->combine_merges) {
                /* There was no "-m" on the command line */
                rev->ignore_merges = 0;
                if (!rev->first_parent_only && !rev->combine_merges) {

-                       /* No "--first-parent", "-c", nor "--cc" */
+                       /* No "--first-parent", "-c", or "--cc" */

                        rev->combine_merges = 1;
                        rev->dense_combined_merges = 1;
                }
                        rev->combine_merges = 1;
                        rev->dense_combined_merges = 1;
                }

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f1026d7ba62be8e029c31138d5661f65c7..ef1f20ea94ff9567d23f7cef5203020d9365d5bd 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -999,7 +999,7 @@ static int pbase_tree_cache_ix_incr(int ix)
 static struct pbase_tree {
        struct pbase_tree *next;
        /* This is a phony "cache" entry; we are not
 static struct pbase_tree {
        struct pbase_tree *next;
        /* This is a phony "cache" entry; we are not

-        * going to evict it nor find it through _get()
+        * going to evict it or find it through _get()

         * mechanism -- this is for the toplevel node that
         * would almost always change with any commit.
         */
         * mechanism -- this is for the toplevel node that
         * would almost always change with any commit.
         */

diff --git a/column.c b/column.c
index 9367ba5db589e63b770c431121176ff046603d06..8d1ce88d1493cf18436b03f843c6d90190d47bb2 100644 (file)
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)
                value += strspn(value, sep);
        }
        /*
                value += strspn(value, sep);
        }
        /*

-        * Setting layout implies "always" if neither always, never
-        * nor auto is specified.
+        * If none of "always", "never", and "auto" is specified, then setting
+        * layout implies "always".

         *
         * Current value in COL_ENABLE_MASK is disregarded. This means if
         * you set column.ui = auto and pass --column=row, then "auto"
         *
         * Current value in COL_ENABLE_MASK is disregarded. This means if
         * you set column.ui = auto and pass --column=row, then "auto"

diff --git a/contrib/examples/git-checkout.sh b/contrib/examples/git-checkout.sh
index 1a7689a48f07a6ed2bb156f745bfea19a10e3eb9..d2c1f98b8628e2b807bc49ff310097686f3da6e6 100755 (executable)
--- a/contrib/examples/git-checkout.sh
+++ b/contrib/examples/git-checkout.sh
@@ -168,7 +168,7 @@ cd_to_toplevel
 # branch.  However, if "git checkout HEAD" detaches the HEAD
 # from the current branch, even though that may be logically
 # correct, it feels somewhat funny.  More importantly, we do not
 # branch.  However, if "git checkout HEAD" detaches the HEAD
 # from the current branch, even though that may be logically
 # correct, it feels somewhat funny.  More importantly, we do not

-# want "git checkout" nor "git checkout -f" to detach HEAD.
+# want "git checkout" or "git checkout -f" to detach HEAD.

 
 detached=
 detach_warn=
 
 detached=
 detach_warn=

diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh
index bafeb52cd113ad8a07ffd1912191f2bc17a7ef7a..cb1bbf3b90e911ac5fea09e00d6e0189b8ee7104 100755 (executable)
--- a/contrib/examples/git-reset.sh
+++ b/contrib/examples/git-reset.sh
@@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac
 
 # git reset --mixed tree [--] paths... can be used to
 # load chosen paths from the tree into the index without
 
 # git reset --mixed tree [--] paths... can be used to
 # load chosen paths from the tree into the index without

-# affecting the working tree nor HEAD.
+# affecting the working tree or HEAD.

 if test $# != 0
 then
        test "$reset_type" = "--mixed" ||
 if test $# != 0
 then
        test "$reset_type" = "--mixed" ||


@@ -60,7 +60,7 @@ then
        update=-u
 fi
 
        update=-u
 fi
 

-# Soft reset does not touch the index file nor the working tree
+# Soft reset does not touch the index file or the working tree

 # at all, but requires them in a good order.  Other resets reset
 # the index file to the tree object we are switching to.
 if test "$reset_type" = "--soft"
 # at all, but requires them in a good order.  Other resets reset
 # the index file to the tree object we are switching to.
 if test "$reset_type" = "--soft"

diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl
index 7f3afa5ac4a4ca979a4e5dd63ebc59344f20857b..4dec1f18e425bd755052ca5645651eec47821cc0 100755 (executable)
--- a/contrib/fast-import/import-directories.perl
+++ b/contrib/fast-import/import-directories.perl
@@ -109,8 +109,8 @@ =head3 Revision contents section
 be removed.
 
 If an on-disk revision is incomplete, you can point to files from
 be removed.
 
 If an on-disk revision is incomplete, you can point to files from

-a previous revision. There are no restriction as to where the source
-files are located, nor to the names of them.
+a previous revision. There are no restrictions on where the source
+files are located, nor on their names.

 
  [3.files]
  ; the key is the path inside the repository, the value is the path
 
  [3.files]
  ; the key is the path inside the repository, the value is the path

diff --git a/delta.h b/delta.h
index b9d333dd5a1c64ab35159ed608cf942951504f84..9b67531dfa4e6511d0c7a4d6d400a3d3719603bc 100644 (file)
--- a/delta.h
+++ b/delta.h
@@ -9,7 +9,7 @@ struct delta_index;
  *
  * This returns a pointer to a struct delta_index that should be passed to
  * subsequent create_delta() calls, or to free_delta_index().  A NULL pointer
  *
  * This returns a pointer to a struct delta_index that should be passed to
  * subsequent create_delta() calls, or to free_delta_index().  A NULL pointer

- * is returned on failure.  The given buffer must not be freed nor altered
+ * is returned on failure.  The given buffer must not be freed or altered

  * before free_delta_index() is called.  The returned pointer must be freed
  * using free_delta_index().
  */
  * before free_delta_index() is called.  The returned pointer must be freed
  * using free_delta_index().
  */

diff --git a/diff.c b/diff.c
index 1cd4672d0328525a30969b40bda4b5cc4d95d374..635dee244d767bffc689550fd3e32d0ac1a37fea 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3942,7 +3942,7 @@ static int diff_scoreopt_parse(const char *opt)
                }
        }
        if (cmd != 'M' && cmd != 'C' && cmd != 'B')
                }
        }
        if (cmd != 'M' && cmd != 'C' && cmd != 'B')

-               return -1; /* that is not a -M, -C nor -B option */
+               return -1; /* that is not a -M, -C, or -B option */

 
        opt1 = parse_rename_score(&opt);
        if (cmd != 'B')
 
        opt1 = parse_rename_score(&opt);
        if (cmd != 'B')

diff --git a/git-am.sh b/git-am.sh
index bbea43075be030c272ef0d8e4cb9c25a179d4e53..e92e5bb121d50d21f104c3f66e90a7c1db5f34a6 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
                esac
        fi
 
                esac
        fi
 

-       # Make sure we are not given --skip, --continue, nor --abort
+       # Make sure we are not given --skip, --continue, or --abort

        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"
 
        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"
 

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3bc0f0b5ca0995910e0e517b545b5fb9af626a8b..52108b925526764f78be017afc47003036469346 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1490,7 +1490,7 @@ sub is_valid_pathname {
        my $input = shift;
 
        return undef unless defined $input;
        my $input = shift;
 
        return undef unless defined $input;

-       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # no '.' or '..' as elements of path, i.e. no '.' or '..'

        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {

diff --git a/http.h b/http.h
index cd37d5881cb0e63e52bd33d0b49bed49645340f5..a766066dfde652d13bbd30f1bb83928b1e727f22 100644 (file)
--- a/http.h
+++ b/http.h
@@ -13,8 +13,7 @@
 /*
  * We detect based on the cURL version if multi-transfer is
  * usable in this implementation and define this symbol accordingly.
 /*
  * We detect based on the cURL version if multi-transfer is
  * usable in this implementation and define this symbol accordingly.

- * This is not something Makefile should set nor users should pass
- * via CFLAGS.
+ * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).

  */
 #undef USE_CURL_MULTI
 
  */
 #undef USE_CURL_MULTI
 

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 6e804a271ca4c6b38b9769f16ace4fb9bc0b88cd..62f3293be4447b2c823d8bcbc6cc0e5dff240c98 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1191,7 +1191,7 @@ sub do_fetch {
                # we can have a branch that was deleted, then re-added
                # under the same name but copied from another path, in
                # which case we'll have multiple parents (we don't
                # we can have a branch that was deleted, then re-added
                # under the same name but copied from another path, in
                # which case we'll have multiple parents (we don't

-               # want to break the original ref, nor lose copypath info):
+               # want to break the original ref or lose copypath info):

                if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
                        push @{$log_entry->{parents}}, $lc;
                        return $log_entry;
                if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
                        push @{$log_entry->{parents}}, $lc;
                        return $log_entry;

diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index 30daf354655f0b4cc02d08e7ba5af43133a09b95..cf6ffa7581310986b7618da36346dc499a9fb098 100644 (file)
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -1,6 +1,6 @@
 package Git::SVN::Migration;
 # these version numbers do NOT correspond to actual version numbers
 package Git::SVN::Migration;
 # these version numbers do NOT correspond to actual version numbers

-# of git nor git-svn.  They are just relative.
+# of git or git-svn.  They are just relative.

 #
 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
 #
 #
 # v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
 #

diff --git a/pkt-line.h b/pkt-line.h
index 0a838d1656171019c07fe802d615ecaf78412003..3cb9d91baaa5bbd09e1ca55e8754e1c4edb6bd97 100644 (file)
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
  * Read a packetized line into the buffer, which must be at least size bytes
  * long. The return value specifies the number of bytes read into the buffer.
  *
  * Read a packetized line into the buffer, which must be at least size bytes
  * long. The return value specifies the number of bytes read into the buffer.
  *

- * If src_buffer is not NULL (and nor is *src_buffer), it should point to a
- * buffer containing the packet data to parse, of at least *src_len bytes.
- * After the function returns, src_buf will be incremented and src_len
- * decremented by the number of bytes consumed.
+ * If src_buffer and *src_buffer are not NULL, it should point to a buffer
+ * containing the packet data to parse, of at least *src_len bytes.  After the
+ * function returns, src_buf will be incremented and src_len decremented by the
+ * number of bytes consumed.

  *
  * If src_buffer (or *src_buffer) is NULL, then data is read from the
  * descriptor "fd".
  *
  * If src_buffer (or *src_buffer) is NULL, then data is read from the
  * descriptor "fd".

diff --git a/remote.c b/remote.c
index 5f63d55056e7f1087766374a20a23e794bf3530a..f43c7a9d531db7a36634e6103bfdf60ee3ca22e1 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1409,7 +1409,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
                                /*
                                 * Remote doesn't have it, and we have no
                                 * explicit pattern, and we don't have
                                /*
                                 * Remote doesn't have it, and we have no
                                 * explicit pattern, and we don't have

-                                * --all nor --mirror.
+                                * --all or --mirror.

                                 */
                                goto free_name;
 
                                 */
                                goto free_name;
 

diff --git a/sha1_file.c b/sha1_file.c
index 6e8c05d10825ee93d8248f749d4bef513d772be4..b79efe431ef9ed0a737b74084f83a4b7680d4497 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -787,7 +787,7 @@ void close_pack_index(struct packed_git *p)
  * contain the same set of objects as an existing one.  In that case
  * the resulting file might be different even if its name would be the
  * same.  It is best to close any reference to the old pack before it is
  * contain the same set of objects as an existing one.  In that case
  * the resulting file might be different even if its name would be the
  * same.  It is best to close any reference to the old pack before it is

- * replaced on disk.  Of course no index pointers nor windows for given pack
+ * replaced on disk.  Of course no index pointers or windows for given pack

  * must subsist at this point.  If ever objects from this pack are requested
  * again, the new version of the pack will be reinitialized through
  * reprepare_packed_git().
  * must subsist at this point.  If ever objects from this pack are requested
  * again, the new version of the pack will be reinitialized through
  * reprepare_packed_git().

diff --git a/test-chmtime.c b/test-chmtime.c
index 0df748784bb7f6b6f286dd37ada293df17cffeee..dfe8a83261b3623e64f99ddf8dc775616771ec4d 100644 (file)
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -1,6 +1,6 @@
 /*
  * This program can either change modification time of the given
 /*
  * This program can either change modification time of the given

- * file(s) or just print it. The program does not change atime nor
+ * file(s) or just print it. The program does not change atime or

  * ctime (their values are explicitly preserved).
  *
  * The mtime can be changed to an absolute value:
  * ctime (their values are explicitly preserved).
  *
  * The mtime can be changed to an absolute value: