Re: [PATCH v2] Fix spelling of "occurred"

[Peter Colberg]

On Fri, Jun 10, 2016 at 02:15:58PM -0700, Junio C Hamano wrote:
> For this one, I am tempted to say that it may be better to remove
> the verb altogether, which would lead to a more concise error
> message.

Thanks, I will send [PATCH v3] when the next release cycle begins.

Peter
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2] Fix spelling of "occurred"

[Peter Colberg]

Signed-off-by: Peter Colberg <pe...@colberg.org>
---
 config.c | 2 +-
 refs.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.c b/config.c
index f51c56b..d7ce34b 100644
--- 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
index 9230d47..56089d5 100644
--- 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.
-- 
2.8.1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Fix spelling of "occurred"

[Peter Colberg]

Signed-off-by: Peter Colberg <pe...@colberg.org>
---
 config.c| 2 +-
 po/bg.po| 2 +-
 po/ca.po| 2 +-
 po/de.po| 2 +-
 po/fr.po| 2 +-
 po/git.pot  | 2 +-
 po/ko.po| 2 +-
 po/pt_PT.po | 2 +-
 po/ru.po| 2 +-
 po/sv.po| 2 +-
 po/vi.po| 2 +-
 po/zh_CN.po | 2 +-
 refs.h  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config.c b/config.c
index f51c56b..d7ce34b 100644
--- 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/po/bg.po b/po/bg.po
index ac6f103..462eb9a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -498,7 +498,7 @@ msgid "unable to parse command-line config"
 msgstr "неправилни настройки от командния ред"
 
 #: config.c:1277
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
 #: config.c:1601
diff --git a/po/ca.po b/po/ca.po
index 46000d7..b3dbba7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -419,7 +419,7 @@ msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr "ha ocorregut un error desconegut en llegir els fitxers de configuració"
 
 #: config.c:1629
diff --git a/po/de.po b/po/de.po
index 0eadf34..5bf91a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -417,7 +417,7 @@ msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
diff --git a/po/fr.po b/po/fr.po
index 55ca387..81465a9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -483,7 +483,7 @@ msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
 #: config.c:1629
diff --git a/po/git.pot b/po/git.pot
index 72ef798..7a3e9ba 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -390,7 +390,7 @@ msgid "unable to parse command-line config"
 msgstr ""
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
 #: config.c:1629
diff --git a/po/ko.po b/po/ko.po
index 3ff3b9b..f1017b8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -460,7 +460,7 @@ msgid "unable to parse command-line config"
 msgstr "명령행 설정을 파싱할 수 없습니다"
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
 
 #: config.c:1629
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 321b553..896eb2a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -410,7 +410,7 @@ msgid "unable to parse command-line config"
 msgstr "não é possível analisar configuração de linha de comandos"
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
 
diff --git a/po/ru.po b/po/ru.po
index c0a838b..974b9ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -398,7 +398,7 @@ msgid "unable to parse command-line config"
 msgstr "не удалось разобрать конфигурацию из командной строки"
 
 #: config.c:1281
-msgid "unknown error occured while reading the configuration files"
+msgid "unknown error occurred while reading the configuration files"
 msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
 
 #: config.c:1629
diff --git a/po/sv.po b/po/sv.po

Re: Git Perl module not installed to --prefix

[Peter Colberg]

On Thu, Sep 13, 2012 at 02:30:19PM -0400, Peter Colberg wrote:
 I have trouble installing the Git Perl module to the correct
 installation prefix, which is required for git send-email.
 
 The problem is reproducible with the following commands:
 
 ./configure --prefix=/home/peter/usr/rhel6-x86_64/git-1.7.12
 make
 make install
 
 While git is installed to --prefix, the Git Perl module is not:

Sorry, I have figured out the reason: The above commands are in fact
invoked from an installation makefile, which uses PREFIX as the
package installation prefix. Apparently this PREFIX variable was
inherited by make install, but only for the perl module.

make -f packages.mk PREFIX=/home/peter/usr/rhel6-x86_64 
CONCURRENCY_LEVEL=16 install-git

If I run configure/make/make install manually, it works fine.

Please excuse the false report.

Peter
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html