Skip to content

Commit 4fecc01

Browse files
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 e004c51 commit 4fecc01

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
@@ -997,7 +997,7 @@ static int update_file_flags(struct merge_options *opt,
997997
char *lnk = xmemdupz(buf, size);
998998
safe_create_leading_directories_const(path);
999999
unlink(path);
1000-
if (create_symlink(&opt->orig_index, lnk, path))
1000+
if (create_symlink(&opt->priv->orig_index, lnk, path))
10011001
ret = err(opt, _("failed to symlink '%s': %s"),
10021002
path, strerror(errno));
10031003
free(lnk);

0 commit comments

Comments
 (0)