kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-12-01 09:04:34 -08:00
parent bcb06e204c 77363a51fb
commit 5149902ff9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-filter-branch.txt
View File

@ -649,7 +649,7 @@ create hoards of confusing empty commits
commits from before the filtering operation are also pruned instead of commits from before the filtering operation are also pruned instead of
just pruning commits that became empty due to filtering rules. 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...) 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 * A minor issue, but users who have a goal to update all names and

6
hashmap.h
View File

@ -59,7 +59,7 @@
* *
* if (!strcmp("print_all_by_key", action)) { * if (!strcmp("print_all_by_key", action)) {
* struct long2string k, *e; * 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; * k.key = key;
* *
* flags &= ~COMPARE_VALUE; * flags &= ~COMPARE_VALUE;
@ -87,12 +87,12 @@
* *
* if (!strcmp("has_exact_match_no_heap_alloc", action)) { * if (!strcmp("has_exact_match_no_heap_alloc", action)) {
* struct long2string k; * struct long2string k;
* hashmap_entry_init(&k->ent, memhash(&key, sizeof(long))); * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
* k.key = key; * k.key = key;
* *
* flags |= COMPARE_VALUE; * flags |= COMPARE_VALUE;
* printf("%sfound\n", * printf("%sfound\n",
* hashmap_get(&map, &k->ent, value) ? "" : "not "); * hashmap_get(&map, &k.ent, value) ? "" : "not ");
* } * }
* *
* if (!strcmp("end", action)) { * if (!strcmp("end", action)) {

2
name-hash.c
View File

@ -218,7 +218,7 @@ static int lookup_lazy_params(struct index_state *istate)
* However, the hashmap is going to put items into bucket * However, the hashmap is going to put items into bucket
* chains based on their hash values. Use that to create n * chains based on their hash values. Use that to create n
* mutexes and lock on mutex[bucket(hash) % n]. This will * 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) static void init_dir_mutex(void)
{ {