summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:34 (GMT)
commit5149902ff9f22e47c5ab52687b540671947d9404 (patch)
treea1e6c469c9af4451fc0dd15411dbdf983f51ad3c
parentbcb06e204c21538067fbd232415ca704f410dbf7 (diff)
parent77363a51fb00a0ca348f3b6bfb5bbe7d36877886 (diff)
downloadgit-5149902ff9f22e47c5ab52687b540671947d9404.zip
git-5149902ff9f22e47c5ab52687b540671947d9404.tar.gz
git-5149902ff9f22e47c5ab52687b540671947d9404.tar.bz2
Merge branch 'en/misc-doc-fixes'
Misc doc fixes. * en/misc-doc-fixes: name-hash.c: remove duplicate word in comment hashmap: fix documentation misuses of -> versus . git-filter-branch.txt: correct argument name typo
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--hashmap.h6
-rw-r--r--name-hash.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 5876598..1ba4667 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -649,7 +649,7 @@ create hoards of confusing empty commits
commits from before the filtering operation are also pruned instead of
just pruning commits that became empty due to filtering rules.
-* If --prune empty is specified, sometimes empty commits are missed
+* If --prune-empty is specified, sometimes empty commits are missed
and left around anyway (a somewhat rare bug, but it happens...)
* A minor issue, but users who have a goal to update all names and
diff --git a/hashmap.h b/hashmap.h
index bd27015..6036069 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -59,7 +59,7 @@
*
* if (!strcmp("print_all_by_key", action)) {
* struct long2string k, *e;
- * hashmap_entry_init(&k->ent, memhash(&key, sizeof(long)));
+ * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
* k.key = key;
*
* flags &= ~COMPARE_VALUE;
@@ -87,12 +87,12 @@
*
* if (!strcmp("has_exact_match_no_heap_alloc", action)) {
* struct long2string k;
- * hashmap_entry_init(&k->ent, memhash(&key, sizeof(long)));
+ * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
* k.key = key;
*
* flags |= COMPARE_VALUE;
* printf("%sfound\n",
- * hashmap_get(&map, &k->ent, value) ? "" : "not ");
+ * hashmap_get(&map, &k.ent, value) ? "" : "not ");
* }
*
* if (!strcmp("end", action)) {
diff --git a/name-hash.c b/name-hash.c
index ceb1d7b..4885bae 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -218,7 +218,7 @@ static int lookup_lazy_params(struct index_state *istate)
* However, the hashmap is going to put items into bucket
* chains based on their hash values. Use that to create n
* mutexes and lock on mutex[bucket(hash) % n]. This will
- * decrease the collision rate by (hopefully) by a factor of n.
+ * decrease the collision rate by (hopefully) a factor of n.
*/
static void init_dir_mutex(void)
{