Merge branch 'sk/typofixes' into master

gitster · gitster · commit 8a111fc01ff6 · 2020-07-30T21:34:29.000-07:00
* sk/typofixes:
  comment: fix spelling mistakes inside comments
diff --git a/add-patch.c b/add-patch.c
@@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,
 	for (;;) {
 		int res = edit_hunk_manually(s, hunk);
 		if (res == 0) {
-			/* abandonded */
+			/* abandoned */
 			*hunk = backup;
 			return -1;
 		}
diff --git a/column.c b/column.c
@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,
 		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,
 			const char *empty_cell, int x, int y)
 {
diff --git a/grep.c b/grep.c
@@ -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
 		 * is not thread-safe. Also, get_oid_with_context() and
 		 * 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.
 		 */
 		grep_attr_lock();
diff --git a/ref-filter.c b/ref-filter.c
@@ -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
  * at one of the oids in the given oid array.
  * 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
  * pointing to annotated tags pointing to a commit.)
  * 2. As the refs are cached we might know what refname peels to without

Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ static int edit_hunk_loop(struct add_p_state *s,`
`1203`	`1203`	`for (;;) {`
`1204`	`1204`	`int res = edit_hunk_manually(s, hunk);`
`1205`	`1205`	`if (res == 0) {`
`1206`		`- /* abandonded */`
	`1206`	`+ /* abandoned */`
`1207`	`1207`	`*hunk = backup;`
`1208`	`1208`	`return -1;`
`1209`	`1209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,`
`107`	`107`	`printf("%s%s%s", indent, list->items[i].string, nl);`
`108`	`108`	`}`
`109`	`109`
`110`		`-/* Print a cell to stdout with all necessary leading/traling space */`
	`110`	`+/* Print a cell to stdout with all necessary leading/trailing space */`
`111`	`111`	`static int display_cell(struct column_data *data, int initial_width,`
`112`	`112`	`const char *empty_cell, int x, int y)`
`113`	`113`	`{`