summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-11-14 10:06:17 +0100
committerPatrick Steinhardt <ps@pks.im>2016-11-14 10:07:55 +0100
commit90a934a5210b60db3d746df3bcb0d6935768ffc1 (patch)
tree73f5b999493071a4342dccbbd704284d619a9326
parent901434b00fc878cf7167dc923e60dd59be101c4f (diff)
downloadlibgit2-90a934a5210b60db3d746df3bcb0d6935768ffc1.tar.gz
checkout: pass string instead of git_buf to `giterr_set`
-rw-r--r--src/checkout.c4
1 files 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;