[PATCH 1/1] do not add common-main to lib

2016-08-15 Thread Christian Hesse
From: Christian Hesse Commit 08aade70 (mingw: declare main()'s argv as const) changed declaration of main function. This breaks linking external projects (e.g. cgit) to libgit.a with: error: Multiple definition of `main' So do not add common-main to lib and let projects have thei

Re: [PATCH 1/1] do not add common-main to lib

2016-08-15 Thread Christian Hesse
Johannes Schindelin on Mon, 2016/08/15 14:20: > Hi Christian, > > On Mon, 15 Aug 2016, Christian Hesse wrote: > > > From: Christian Hesse > > > > Commit 08aade70 (mingw: declare main()'s argv as const) changed > > declaration of main function. This

Re: [PATCH 1/1] do not add common-main to lib

2016-08-15 Thread Christian Hesse
Jeff King on Mon, 2016/08/15 08:02: > On Mon, Aug 15, 2016 at 09:52:07AM +0200, Christian Hesse wrote: > > > From: Christian Hesse > > > > Commit 08aade70 (mingw: declare main()'s argv as const) changed > > declaration of main function. This breaks linking e

cgit and global configuration

2019-06-11 Thread Christian Hesse
m/git/git/commit/bce9db6de97c95882a7c46836bb6cc90acf0fef0 -- Best regards, Christian Hesse pgppGNGJ7cJNi.pgp Description: OpenPGP digital signature

[PATCH 1/1] subtree: add build targets 'man' and 'html'

2018-10-07 Thread Christian Hesse
From: Christian Hesse We have targets 'install-man' and 'install-html', let's add build targets as well. Signed-off-by: Christian Hesse --- contrib/subtree/Makefile | 4 1 file changed, 4 insertions(+) diff --git a/contrib/subtree/Makefile b/contrib/subtree/

Re: [PATCH 1/1] subtree: add build targets 'man' and 'html'

2018-10-15 Thread Christian Hesse
Junio C Hamano on Wed, 2018/10/10 11:26: > As 'contrib' material without real maintenance, I do not care too > deeply, but shouldn't this change be more like this to avoid > duplicating the list of targets? Probably, yes. Do you want to add this yourself or do you want me to send an updated patch

[PATCH 1/1] subtree: make install targets depend on build targets

2018-10-16 Thread Christian Hesse
From: Christian Hesse Now that we have build targets let the install targets depend on them. Also make the targets phony. Signed-off-by: Christian Hesse --- contrib/subtree/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib

Re: [PATCH 1/1] subtree: make install targets depend on build targets

2018-10-18 Thread Christian Hesse
Junio C Hamano on Thu, 2018/10/18 11:09: > Jonathan Nieder writes: > > > The rule says > > > > install-html: html > > $(INSTALL) -d -m 755 $(DESTDIR)$(htmldir) > > $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir) > > > > and $^ substitutes to "html" after this change. > > Sorry about that.

[PATCH 1/1] perl: fix installing modules from contrib

2018-04-03 Thread Christian Hesse
Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. Signed-off-by: Christian Hesse

[PATCH v2 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Christian Hesse
as well, add single quotes for _SQ variant. Signed-off-by: Christian Hesse --- Makefile | 2 ++ contrib/mw-to-git/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96f6138f6..19ca5e8de 100644 --- a/Makefile +++ b

[PATCH v3 1/1] perl: fix installing modules from contrib

2018-04-10 Thread Christian Hesse
as well, add single quotes for _SQ variant. v3: Rename target, add to .PHONY. Signed-off-by: Christian Hesse --- Makefile | 3 +++ contrib/mw-to-git/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f18168725

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

2018-04-18 Thread Christian Hesse
Junio C Hamano on Tue, 2018/04/17 15:07: > * ab/simplify-perl-makefile (2018-04-11) 1 commit > (merged to 'next' on 2018-04-17 at 4448756934) > + perl: fix installing modules from contrib > > Recent simplification of build procedure forgot a bit of tweak to > the build procedure of contrib/m

Re: [PATCH v3 1/1] perl: fix installing modules from contrib

2018-04-19 Thread Christian Hesse
Junio C Hamano on Thu, 2018/04/19 06:44: > Christian Hesse writes: > > > Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make > > rules) removed a target that allowed Makefiles from contrib/ to get the > > correct install path. This introduces a new targ

[PATCH 1/1] tests: fix gzip with exported GZIP variable in environment

2013-12-03 Thread Christian Hesse
In t/t5000-tar-tree.sh the variable GZIP is used for the command name. >From man gzip: > The environment variable GZIP can hold a set of default options for > gzip. These options are interpreted first and can be overwritten by > explicit command line parameters. So using any other variable name f

[PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Christian Hesse
--- t/lib-gpg.sh | 6 ++ t/t7004-tag.sh | 14 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef..05b07c6 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -22,6 +22,12 @@ else GNUPGHOME="$(pwd)/gpghome"

[PATCH v2 1/1] create gpg homedir on the fly and skip RFC1991 tests for gnupg 2.1

2014-12-11 Thread Christian Hesse
GnuPG 2.1 homedir looks different, so just creat it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Additionally GnuPG 2.1 does not longer support RFC1991, so skip these tests. -

[PATCH 1/1] replace binary keyrings with armored keys

2014-12-11 Thread Christian Hesse
--- t/lib-gpg.sh | 3 +- t/lib-gpg/keyring.gpg | 88 ++ t/lib-gpg/pubring.gpg | Bin 2359 -> 0 bytes t/lib-gpg/secring.gpg | Bin 3734 -> 0 bytes 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 t/lib-gpg/keyring.gpg

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-11 Thread Christian Hesse
Michael J Gruber on Thu, 2014/12/11 17:54: > Torsten Bögershausen schrieb am 11.12.2014 um 16:32: > > On 11.12.14 10:30, Christian Hesse wrote: > >> --- > >> t/lib-gpg.sh | 6 ++ > >> t/t7004-tag.sh | 14 +++--- > >> 2 files changed, 13

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-12 Thread Christian Hesse
Junio C Hamano on Thu, 2014/12/11 15:10: > Christian Hesse writes: > > > However... Even if GnuPG 2.2.x (or whatever future release) will become > > next stable: It will not reintroduce support for rfc1991. > > How certain are we about the deprecation? The sixth be

Re: [PATCH v2 1/1] create gpg homedir on the fly and skip RFC1991 tests for gnupg 2.1

2014-12-12 Thread Christian Hesse
Junio C Hamano on Thu, 2014/12/11 14:41: > Christian Hesse writes: > > > GnuPG 2.1 homedir looks different, so just creat it on the fly by > > importing needed private and public keys and ownertrust. > > This solves an issue with gnupg 2.1 running interactive pinentry wh

[PATCH 1/3] create gpg homedir on the fly

2014-12-12 Thread Christian Hesse
GnuPG 2.1 homedir looks different, so just creat it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 10

[PATCH 2/3] skip RFC1991 tests for gnupg 2.1

2014-12-12 Thread Christian Hesse
GnuPG >= 2.1.0 does not longer support RFC1991, so skip these tests. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 3 +++ t/t7004-tag.sh | 14 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 4e57942..b0138ad 100755 ---

[PATCH 3/3] replace binary keyrings with armored keys

2014-12-12 Thread Christian Hesse
Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 3 +- t/lib-gpg/keyring.gpg | 88 ++ t/lib-gpg/pubring.gpg | Bin 2359 -> 0 bytes t/lib-gpg/secring.gpg | Bin 3734 -> 0 bytes 4 files changed, 89 insertions(+), 2 deletions(-)

[PATCH 1/3] create gpg homedir on the fly

2014-12-12 Thread Christian Hesse
GnuPG 2.1 homedir looks different, so just create it on the fly by importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret key is present. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 10

Re: [PATCH 1/1] skip RFC1991 tests with gnupg 2.1.x

2014-12-12 Thread Christian Hesse
Christian Hesse on Fri, 2014/12/12 09:35: > Junio C Hamano on Thu, 2014/12/11 15:10: > > Christian Hesse writes: > > > > > However... Even if GnuPG 2.2.x (or whatever future release) will become > > > next stable: It will not reintroduce support for rfc19

[PATCH 3/3] replace binary keyrings with armored keys

2014-12-12 Thread Christian Hesse
better. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 3 +- t/lib-gpg/keyring.gpg | 88 ++ t/lib-gpg/pubring.gpg | Bin 2359 -> 0 bytes t/lib-gpg/secring.gpg | Bin 3734 -> 0 bytes 4 files changed, 89 insertions(+), 2 del

Re: [PATCH 1/3] create gpg homedir on the fly

2014-12-12 Thread Christian Hesse
sts with "-v" option. > > The splitting of RFC1991 prerequiste part is about future-proofing. > When we want to define other kinds of specific prerequisites in the > future, I'd prefer to see it done separately from the basic set-up > code. Sounds reasonable and looks g

Re: [PATCH 3/3] replace binary keyrings with armored keys

2014-12-13 Thread Christian Hesse
Junio C Hamano on Fri, 2014/12/12 13:50: > Christian Hesse writes: > > Last but not least git and patch can handle this a > > lot better. > > Actually we can handle binary patch just fine ;-) Ah, that was kind of misleading. :-p Generating a patch with git including bina

[PATCH 1/1] tests: make comment match the code

2014-12-16 Thread Christian Hesse
GnuPG homedir is generated on the fly and keys are imported from armored key file. Make commet match available key info and new key generation procedure. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/t/lib