Re: [PATCH v5 15/15] config: rename git_config_set_or_die to git_config_set

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 17, 2016, 21:09 UTC
Message-ID: <xmqqh9h7hwmy.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAO2U3QjYKV_fPWb7CBYqvHXhQjcgZC+ht6VMQso4PBaHXas99Q@mail.gmail.com>

Michael Blume <blume.mike@gmail.com> writes:

[administrivia: please cull unnecessary parts from your quote]

Show 12 quoted lines

>> 1 warning generated.
>>     AR libgit.a
>>     LINK git-credential-store
>> Undefined symbols for architecture x86_64:
>>   "_git_config_set_or_die", referenced from:
>>       _probe_utf8_pathname_composition in libgit.a(precompose_utf8.o)
>> ld: symbol(s) not found for architecture x86_64
>> clang: error: linker command failed with exit code 1 (use -v to see invocation)
>> make: *** [git-credential-store] Error 1
>
> Looks like there's one more use of git_config_set_or_die that needs to
> be removed.

Thanks; let's squash this in.

 compat/precompose_utf8.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 9ff1ebe..dfbe6d8 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -50,8 +50,8 @@ void probe_utf8_pathname_composition(void)
 		close(output_fd);
 		git_path_buf(&path, "%s", auml_nfd);
 		precomposed_unicode = access(path.buf, R_OK) ? 0 : 1;
-		git_config_set_or_die("core.precomposeunicode",
-				      precomposed_unicode ? "true" : "false");
+		git_config_set("core.precomposeunicode",
+			       precomposed_unicode ? "true" : "false");
 		git_path_buf(&path, "%s", auml_nfc);
 		if (unlink(path.buf))
 			die_errno(_("failed to unlink '%s'"), path.buf);