Merge branch 'pc/occurred'

gitster · gitster · commit af325b0f9aba · 2016-06-27T09:56:42.000-07:00
* pc/occurred:
  config.c: fix misspelt "occurred" in an error message
  refs.h: fix misspelt "occurred" in a comment
diff --git a/config.c b/config.c
@@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)
 		 * something went really wrong and we should stop
 		 * immediately.
 		 */
-		die(_("unknown error occured while reading the configuration files"));
+		die(_("unknown error occurred while reading the configuration files"));
 }
 
 static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
diff --git a/refs.h b/refs.h
@@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
  *     msg -- a message describing the change (for the reflog).
  *
  *     err -- a strbuf for receiving a description of any error that
- *         might have occured.
+ *         might have occurred.
  *
  * The functions make internal copies of refname and msg, so the
  * caller retains ownership of these parameters.

Original file line number	Diff line number	Diff line change
`@@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)`
`1281`	`1281`	`* something went really wrong and we should stop`
`1282`	`1282`	`* immediately.`
`1283`	`1283`	`*/`
`1284`		`- die(_("unknown error occured while reading the configuration files"));`
	`1284`	`+ die(_("unknown error occurred while reading the configuration files"));`
`1285`	`1285`	`}`
`1286`	`1286`
`1287`	`1287`	`static void configset_iter(struct config_set cs, config_fn_t fn, void data)`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ struct ref_transaction ref_transaction_begin(struct strbuf err);`
`345`	`345`	`* msg -- a message describing the change (for the reflog).`
`346`	`346`	`*`
`347`	`347`	`* err -- a strbuf for receiving a description of any error that`
`348`		`- * might have occured.`
	`348`	`+ * might have occurred.`
`349`	`349`	`*`
`350`	`350`	`* The functions make internal copies of refname and msg, so the`
`351`	`351`	`* caller retains ownership of these parameters.`