undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sk/typofixes' into master

Browse Source 
* sk/typofixes:
  comment: fix spelling mistakes inside comments
This commit is contained in:
Junio C Hamano 2020-07-30 21:34:29 -07:00
commit 8a111fc01f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
add-patch.c
View File

@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,
for (;;) { for (;;) {
int res = edit_hunk_manually(s, hunk); int res = edit_hunk_manually(s, hunk);
if (res == 0) { if (res == 0) {
/* abandonded */ /* abandoned */
*hunk = backup; *hunk = backup;
return -1; return -1;
} }

2
column.c
View File

@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,
printf("%s%s%s", indent, list->items[i].string, nl); printf("%s%s%s", indent, list->items[i].string, nl);
} }
/* Print a cell to stdout with all necessary leading/traling space */ /* Print a cell to stdout with all necessary leading/trailing space */
static int display_cell(struct column_data *data, int initial_width, static int display_cell(struct column_data *data, int initial_width,
const char *empty_cell, int x, int y) const char *empty_cell, int x, int y)
{ {

2
grep.c
View File

@ -1817,7 +1817,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
* We might set up the shared textconv cache data here, which * We might set up the shared textconv cache data here, which
* is not thread-safe. Also, get_oid_with_context() and * is not thread-safe. Also, get_oid_with_context() and
* parse_object() might be internally called. As they are not * parse_object() might be internally called. As they are not
* currenty thread-safe and might be racy with object reading, * currently thread-safe and might be racy with object reading,
* obj_read_lock() must be called. * obj_read_lock() must be called.
*/ */
grep_attr_lock(); grep_attr_lock();

2
ref-filter.c
View File

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