Skip to content

Commit 71fcf7a

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
fixup??? Introduce helper to create symlinks that knows about index_state
The `orig_index` moved into the field `priv`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 465e62f commit 71fcf7a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

merge-recursive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ static int update_file_flags(struct merge_options *opt,
988988
char *lnk = xmemdupz(buf, size);
989989
safe_create_leading_directories_const(path);
990990
unlink(path);
991-
if (create_symlink(&opt->orig_index, lnk, path))
991+
if (create_symlink(&opt->priv->orig_index, lnk, path))
992992
ret = err(opt, _("failed to symlink '%s': %s"),
993993
path, strerror(errno));
994994
free(lnk);

0 commit comments

Comments
 (0)