From 90a934a5210b60db3d746df3bcb0d6935768ffc1 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 14 Nov 2016 10:06:17 +0100 Subject: [PATCH] checkout: pass string instead of git_buf to `giterr_set` --- src/checkout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checkout.c b/src/checkout.c index b3427fb7c..62950913e 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1966,7 +1966,7 @@ static int checkout_path_suffixed(git_buf *path, const char *suffix) if (i == INT_MAX) { git_buf_truncate(path, path_len); - giterr_set(GITERR_CHECKOUT, "Could not write '%s': working directory file exists", path); + giterr_set(GITERR_CHECKOUT, "Could not write '%s': working directory file exists", path->ptr); return GIT_EEXISTS; } @@ -2469,7 +2469,7 @@ static int checkout_data_init( data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; else { giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'", - conflict_style); + conflict_style->value); error = -1; git_config_entry_free(conflict_style); goto cleanup;