Skip to content

Commit 8a111fc

Browse files
committed
Merge branch 'sk/typofixes' into master
* sk/typofixes: comment: fix spelling mistakes inside comments
2 parents 79bcaf0 + 84544f2 commit 8a111fc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

add-patch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,
12031203
for (;;) {
12041204
int res = edit_hunk_manually(s, hunk);
12051205
if (res == 0) {
1206-
/* abandonded */
1206+
/* abandoned */
12071207
*hunk = backup;
12081208
return -1;
12091209
}

column.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,
107107
printf("%s%s%s", indent, list->items[i].string, nl);
108108
}
109109

110-
/* Print a cell to stdout with all necessary leading/traling space */
110+
/* Print a cell to stdout with all necessary leading/trailing space */
111111
static int display_cell(struct column_data *data, int initial_width,
112112
const char *empty_cell, int x, int y)
113113
{

grep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
18171817
* We might set up the shared textconv cache data here, which
18181818
* is not thread-safe. Also, get_oid_with_context() and
18191819
* parse_object() might be internally called. As they are not
1820-
* currenty thread-safe and might be racy with object reading,
1820+
* currently thread-safe and might be racy with object reading,
18211821
* obj_read_lock() must be called.
18221822
*/
18231823
grep_attr_lock();

ref-filter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
19851985
* of oids. If the given ref is a tag, check if the given tag points
19861986
* at one of the oids in the given oid array.
19871987
* NEEDSWORK:
1988-
* 1. Only a single level of inderection is obtained, we might want to
1988+
* 1. Only a single level of indirection is obtained, we might want to
19891989
* change this to account for multiple levels (e.g. annotated tags
19901990
* pointing to annotated tags pointing to a commit.)
19911991
* 2. As the refs are cached we might know what refname peels to without

0 commit comments

Comments
 (0)