File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -1966,7 +1966,7 @@ static int checkout_path_suffixed(git_buf *path, const char *suffix)
19661966 if (i == INT_MAX ) {
19671967 git_buf_truncate (path , path_len );
19681968
1969- giterr_set (GITERR_CHECKOUT , "Could not write '%s': working directory file exists" , path );
1969+ giterr_set (GITERR_CHECKOUT , "Could not write '%s': working directory file exists" , path -> ptr );
19701970 return GIT_EEXISTS ;
19711971 }
19721972
@@ -2469,7 +2469,7 @@ static int checkout_data_init(
24692469 data -> opts .checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3 ;
24702470 else {
24712471 giterr_set (GITERR_CHECKOUT , "unknown style '%s' given for 'merge.conflictstyle'" ,
2472- conflict_style );
2472+ conflict_style -> value );
24732473 error = -1 ;
24742474 git_config_entry_free (conflict_style );
24752475 goto cleanup ;
You can’t perform that action at this time.
0 commit comments