mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-29 00:23:44 +02:00
Code

Merge branch 'pc/occurred'

Browse Source 
* pc/occurred:
  config.c: fix misspelt "occurred" in an error message
  refs.h: fix misspelt "occurred" in a comment
This commit is contained in:
Junio C Hamano 2016-06-27 09:56:42 -07:00
commit af325b0f9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)
* something went really wrong and we should stop * something went really wrong and we should stop
* immediately. * 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) static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)

2
refs.h
View File

@ -345,7 +345,7 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
* msg -- a message describing the change (for the reflog). * msg -- a message describing the change (for the reflog).
* *
* err -- a strbuf for receiving a description of any error that * 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 * The functions make internal copies of refname and msg, so the
* caller retains ownership of these parameters. * caller retains ownership of these parameters.