Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.9.2 2016-06-03T21:38:02Z 2016-06-03T21:38:02Z Junio C Hamano gitster@pobox.com 2016-06-03T21:38:02Z urn:sha1:ec5ad66ee28ba2eac3141b720d48485dc978faab "make DEVELOPER=1" worked as expected; setting DEVELOPER=1 in config.mak didn't. * mm/makefile-developer-can-be-in-config-mak: Makefile: add $(DEVELOPER_CFLAGS) variable Makefile: move 'ifdef DEVELOPER' after config.mak* inclusion 2016-06-01T15:17:15Z Matthieu Moy Matthieu.Moy@imag.fr 2016-06-01T08:00:08Z urn:sha1:51dd3e81d4b5098d7eca9a1370616b8e8f7784c2 This does not change the behavior, but allows the user to tweak DEVELOPER_CFLAGS on the command-line or in a config.mak* file if needed. This also makes the code somewhat cleaner as it follows the pattern <initialisation of variables> <include statements> <actual build logic> by specifying which flags to activate in the first part, and actually activating them in the last one. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2016-05-31T17:01:51Z Matthieu Moy Matthieu.Moy@imag.fr 2016-05-31T13:24:43Z urn:sha1:d615628c354ad2aaf3f3f37b3f84ddcc7c3537c6 The DEVELOPER knob was introduced in 658df95 (add DEVELOPER makefile knob to check for acknowledged warnings, 2016-02-25), and works well when used as "make DEVELOPER=1", and when the configure script was not used. However, the advice given in CodingGuidelines to add DEVELOPER=1 to config.mak does not: config.mak is included after testing for DEVELOPER in the Makefile, and at least GNU Make's manual specifies "Conditional directives are parsed immediately", hence the config.mak declaration is not visible at the time the conditional is evaluated. Also, when using the configure script to generate a config.mak.autogen, the later file contained a "CFLAGS = <flags>" initialization, which overrode the "CFLAGS += -W..." triggered by DEVELOPER. This patch fixes both issues. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2016-05-26T20:17:20Z Junio C Hamano gitster@pobox.com 2016-05-26T20:17:20Z urn:sha1:b262b8f889392623f8b6772505de013d0796824d Mark several messages for translation. * va/i18n-misc-updates: i18n: unpack-trees: avoid substituting only a verb in sentences i18n: builtin/pull.c: split strings marked for translation i18n: builtin/pull.c: mark placeholders for translation i18n: git-parse-remote.sh: mark strings for translation i18n: branch: move comment for translators i18n: branch: unmark string for translation i18n: builtin/rm.c: remove a comma ',' from string i18n: unpack-trees: mark strings for translation i18n: builtin/branch.c: mark option for translation i18n: index-pack: use plural string instead of normal one 2016-05-23T21:54:34Z Junio C Hamano gitster@pobox.com 2016-05-23T21:54:34Z urn:sha1:fa4f29b8a8febd454fb589f96afa014d73f157c1 Find common mistakes when writing gitlink: in our documentation and drive the check from "make check-docs". I am not entirely happy with the way the script chooses what input file to validate, but it is not worse than not having anything, so let's move it forward and have the logic improved later when people care about it deeply. * jc/doc-lint: ci: validate "linkgit:" in documentation 2016-05-17T21:38:23Z Junio C Hamano gitster@pobox.com 2016-05-17T21:38:22Z urn:sha1:e5e7a9115dc9373f18a6470139cf05d4a541fb16 Mark several messages for translation. * va/i18n-misc-updates: i18n: unpack-trees: avoid substituting only a verb in sentences i18n: builtin/pull.c: split strings marked for translation i18n: builtin/pull.c: mark placeholders for translation i18n: git-parse-remote.sh: mark strings for translation i18n: branch: move comment for translators i18n: branch: unmark string for translation i18n: builtin/rm.c: remove a comma ',' from string i18n: unpack-trees: mark strings for translation i18n: builtin/branch.c: mark option for translation i18n: index-pack: use plural string instead of normal one 2016-05-10T18:15:04Z Junio C Hamano gitster@pobox.com 2016-05-04T21:34:23Z urn:sha1:ab81411cede9e5fe52b416c4df835e19f1048426 It is easy to add incorrect "linkgit:<page>[<section>]" references to our documentation suite. Catch these common classes of errors: * Referring to Documentation/<page>.txt that does not exist. * Referring to a <page> outside the Git suite. In general, <page> must begin with "git". * Listing the manual <section> incorrectly. The first line of the Documentation/<page>.txt must end with "(<section>)". with a new script "ci/lint-gitlink", and drive it from "make check-docs". Signed-off-by: Junio C Hamano <gitster@pobox.com> 2016-05-06T21:53:24Z Junio C Hamano gitster@pobox.com 2016-05-06T21:53:24Z urn:sha1:a0c9cf51c0ba6ca30f7325bc035200010f2c50f7 Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs we use in imap-send, which has been adjusted for the change. * ky/imap-send-openssl-1.1.0: configure: remove checking for HMAC_CTX_cleanup imap-send: avoid deprecated TLSv1_method() imap-send: check NULL return of SSL_CTX_new() imap-send: use HMAC() function provided by OpenSSL 2016-05-06T21:45:44Z Junio C Hamano gitster@pobox.com 2016-05-06T21:45:44Z urn:sha1:54b0ac57ab90c233a5a076904173c82e3d7db509 As nobody maintains our in-tree git.spec.in and distros use their own spec file, we stopped pretending that we support "make rpm". * jc/drop-git-spec-in: Makefile: remove dependency on git.spec Makefile: stop pretending to support rpmbuild 2016-04-29T21:15:59Z Junio C Hamano gitster@pobox.com 2016-04-29T21:15:59Z urn:sha1:98eef4825770fa75f7397fcd10cdd5c8efaac210 A minor fix in the Makefile. * jc/makefile-redirection-stderr: Makefile: fix misdirected redirections