Commit 90a934a5 by Patrick Steinhardt

checkout: pass string instead of git_buf to `giterr_set`

parent 901434b0
...@@ -1966,7 +1966,7 @@ static int checkout_path_suffixed(git_buf *path, const char *suffix) ...@@ -1966,7 +1966,7 @@ static int checkout_path_suffixed(git_buf *path, const char *suffix)
if (i == INT_MAX) { if (i == INT_MAX) {
git_buf_truncate(path, path_len); 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; return GIT_EEXISTS;
} }
...@@ -2469,7 +2469,7 @@ static int checkout_data_init( ...@@ -2469,7 +2469,7 @@ static int checkout_data_init(
data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3;
else { else {
giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'", giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'",
conflict_style); conflict_style->value);
error = -1; error = -1;
git_config_entry_free(conflict_style); git_config_entry_free(conflict_style);
goto cleanup; goto cleanup;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment