diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:03:26 -0700 |
| commit | 3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch) | |
| tree | 5f5b11703f64319bcb71603c825d382f4703a763 /sha1_file.c | |
| parent | Merge branch 'cn/fetch-prune-overlapping-destination' into maint (diff) | |
| parent | code and test: fix misuses of "nor" (diff) | |
| download | tgif-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz | |
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and:
code and test: fix misuses of "nor"
comments: fix misuses of "nor"
contrib: fix misuses of "nor"
Documentation: fix misuses of "nor"
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 6e8c05d108..77dbb56946 100644 --- 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 - * 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(). @@ -1123,7 +1123,7 @@ static void report_helper(const struct string_list *list, const char *msg; switch (seen_bits) { case 0: - msg = "no corresponding .idx nor .pack"; + msg = "no corresponding .idx or .pack"; break; case 1: msg = "no corresponding .idx"; |