diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:37:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:37:39 -0800 |
| commit | 14f563031d21a26aa28a08f795c6d2c36580a7bf (patch) | |
| tree | 3957166dfbb1f671c3027a356da52fc3dbf1d8ea | |
| parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
| parent | a9942e108c9848ec5b69b6dddc59977d3f586aa9 (diff) | |
| download | git-14f563031d21a26aa28a08f795c6d2c36580a7bf.tar.gz | |
Merge branch 'ak/typofixes'
* ak/typofixes:
t/lib-terminal.sh: fix typo
pack-bitmap: fix typo
| -rw-r--r-- | pack-bitmap.c | 2 | ||||
| -rw-r--r-- | t/lib-terminal.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 6a818419ca..3281df389e 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -60,7 +60,7 @@ static struct bitmap_index { struct ewah_bitmap *blobs; struct ewah_bitmap *tags; - /* Map from SHA1 -> `stored_bitmap` for all the bitmapped comits */ + /* Map from SHA1 -> `stored_bitmap` for all the bitmapped commits */ khash_sha1 *bitmaps; /* Number of bitmapped commits */ diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh index 51845491bb..cd220e378e 100644 --- a/t/lib-terminal.sh +++ b/t/lib-terminal.sh @@ -1,7 +1,7 @@ # Helpers for terminal output tests. # Catch tests which should depend on TTY but forgot to. There's no need -# to aditionally check that the TTY prereq is set here. If the test declared +# to additionally check that the TTY prereq is set here. If the test declared # it and we are running the test, then it must have been set. test_terminal () { if ! test_declared_prereq TTY |