From a6d39f2efbdf5f8daceaf7bfa9a1b32c2a9cdafa Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 5 Nov 2019 23:31:30 +0000 Subject: [PATCH 1/3] git-filter-branch.txt: correct argument name typo Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-filter-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 5876598852..1ba4667b12 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 From c92faa4d22a1377ab9776063cfd33b3cfd9f5884 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 5 Nov 2019 23:31:31 +0000 Subject: [PATCH 2/3] hashmap: fix documentation misuses of -> versus . Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- hashmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hashmap.h b/hashmap.h index bd2701549f..6036069c23 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)) { From 77363a51fb00a0ca348f3b6bfb5bbe7d36877886 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 5 Nov 2019 23:31:32 +0000 Subject: [PATCH 3/3] name-hash.c: remove duplicate word in comment Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- name-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/name-hash.c b/name-hash.c index ceb1d7bd6f..4885bae5da 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) {