git/setup.c, branch v2.12.2

real_pathdup(): fix callsites that wanted it to die on error

2017-03-08T22:38:41Z

In 4ac9006f832 (real_path: have callers use real_pathdup and strbuf_realpath, 2016-12-12), we changed the xstrdup(real_path()) pattern to use real_pathdup() directly. The problem with this change is that real_path() calls strbuf_realpath() with die_on_error = 1 while real_pathdup() calls it with die_on_error = 0. Meaning that in cases where real_path() causes Git to die() with an error message, real_pathdup() is silent and returns NULL instead. The callers, however, are ill-prepared for that change, as they expect the return value to be non-NULL (and otherwise the function died with an appropriate error message). Fix this by extending real_pathdup()'s signature to accept the die_on_error flag and simply pass it through to strbuf_realpath(), and then adjust all callers after a careful audit whether they would handle NULLs well. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

cache.h: expose the dying procedure for reading gitlinks

2017-01-26T19:00:58Z

In a later patch we want to react to only a subset of errors, defaulting the rest to die as usual. Separate the block that takes care of dying into its own function so we have easy access to it. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

setup: add gentle version of resolve_git_dir

2017-01-26T19:00:24Z

This follows a93bedada (setup: add gentle version of read_gitfile, 2015-06-09), and assumes the same reasoning. resolve_git_dir is unsuited for speculative calls, so we want to use the gentle version to find out about potential errors. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

real_path: have callers use real_pathdup and strbuf_realpath

2016-12-12T23:22:32Z

Migrate callers of real_path() who duplicate the retern value to use real_pathdup or strbuf_realpath. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

i18n: setup: mark error messages for translation

2016-08-09T19:44:59Z

Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

i18n: setup: mark strings for translation

2016-06-17T22:45:48Z

Update tests that compare the strings newly marked for translation to succeed when running under GETTEXT_POISON. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

Merge branch 'jc/xstrfmt-null-with-prec-0'

2016-04-22T22:45:08Z

* jc/xstrfmt-null-with-prec-0: setup.c: do not feed NULL to "%.*s" even with precision 0

Merge branch 'jk/check-repository-format'

2016-04-13T21:12:28Z

The repository set-up sequence has been streamlined (the biggest change is that there is no longer git_config_early()), so that we do not attempt to look into refs/* when we know we do not have a Git repository. * jk/check-repository-format: verify_repository_format: mark messages for translation setup: drop repository_format_version global setup: unify repository version callbacks init: use setup.c's repo version verification setup: refactor repo format reading and verification config: drop git_config_early check_repository_format_gently: stop using git_config_early lazily load core.sharedrepository wrap shared_repository global in get/set accessors setup: document check_repository_format()

setup.c: do not feed NULL to "%.*s" even with precision 0

2016-04-07T19:40:15Z

A recent update 75faa45a (replace trivial malloc + sprintf / strcpy calls with xstrfmt, 2015-09-24) rewrote prepare an empty buffer if (len) append the first len bytes of "prefix" to the buffer append "path" to the buffer that computed "path", optionally prefixed by "prefix", into xstrfmt("%.*s%s", len, prefix, path); However, passing a NULL pointer to the printf(3) family of functions to format it with %s conversion, even with the precision set to 0, i.e. xstrfmt("%.*s", 0, NULL) yields undefined results, at least on some platforms. Avoid this problem by substituting prefix with "" when len==0, as prefix can legally be NULL in that case. This would mimick the intent of the original code better. Reported-by: Tom G. Christensen Helped-by: Jeff King Signed-off-by: Junio C Hamano

verify_repository_format: mark messages for translation

2016-03-11T23:02:24Z

These messages are human-readable and should be translated. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano