Skip to content

Commit 1b882b6

Browse files
dschoGit for Windows Build Agent
authored andcommitted
Introduce helper to create symlinks that knows about index_state
On Windows, symbolic links actually have a type depending on the target: it can be a file or a directory. In certain circumstances, this poses problems, e.g. when a symbolic link is supposed to point into a submodule that is not checked out, so there is no way for Git to auto-detect the type. To help with that, we will add support over the course of the next commits to specify that symlink type via the Git attributes. This requires an index_state, though, something that Git for Windows' `symlink()` replacement cannot know about because the function signature is defined by the POSIX standard and not ours to change. So let's introduce a helper function to create symbolic links that *does* know about the index_state. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 442d43e commit 1b882b6

8 files changed

Lines changed: 20 additions & 8 deletions

File tree

apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4460,7 +4460,7 @@ static int try_create_file(struct apply_state *state, const char *path,
44604460
/* Although buf:size is counted string, it also is NUL
44614461
* terminated.
44624462
*/
4463-
return !!symlink(buf, path);
4463+
return !!create_symlink(state && state->repo ? state->repo->index : NULL, buf, path);
44644464

44654465
fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
44664466
if (fd < 0)

builtin/difftool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ static int run_dir_diff(struct repository *repo,
544544
}
545545
add_path(&wtdir, wtdir_len, dst_path);
546546
if (dt_options->symlinks) {
547-
if (symlink(wtdir.buf, rdir.buf)) {
547+
if (create_symlink(lstate.istate, wtdir.buf, rdir.buf)) {
548548
ret = error_errno("could not symlink '%s' to '%s'", wtdir.buf, rdir.buf);
549549
goto finish;
550550
}

compat/mingw-posix.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,10 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
193193
int sigaction(int sig, struct sigaction *in, struct sigaction *out);
194194
int link(const char *oldpath, const char *newpath);
195195
int uname(struct utsname *buf);
196-
int symlink(const char *target, const char *link);
197196
int readlink(const char *path, char *buf, size_t bufsiz);
197+
struct index_state;
198+
int mingw_create_symlink(struct index_state *index, const char *target, const char *link);
199+
#define create_symlink mingw_create_symlink
198200

199201
/*
200202
* replacements of existing functions

compat/mingw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3247,7 +3247,7 @@ int link(const char *oldpath, const char *newpath)
32473247
return 0;
32483248
}
32493249

3250-
int symlink(const char *target, const char *link)
3250+
int mingw_create_symlink(struct index_state *index UNUSED, const char *target, const char *link)
32513251
{
32523252
wchar_t wtarget[MAX_LONG_PATH], wlink[MAX_LONG_PATH];
32533253
int len;

entry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
324324
if (!has_symlinks || to_tempfile)
325325
goto write_file_entry;
326326

327-
ret = symlink(new_blob, path);
327+
ret = create_symlink(state->istate, new_blob, path);
328328
free(new_blob);
329329
if (ret)
330330
return error_errno("unable to create symlink %s", path);

git-compat-util.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,16 @@ static inline int git_has_dir_sep(const char *path)
367367
#define is_mount_point is_mount_point_via_stat
368368
#endif
369369

370+
#ifndef create_symlink
371+
struct index_state;
372+
static inline int git_create_symlink(struct index_state *index UNUSED,
373+
const char *target, const char *link)
374+
{
375+
return symlink(target, link);
376+
}
377+
#define create_symlink git_create_symlink
378+
#endif
379+
370380
#ifndef query_user_email
371381
#define query_user_email() NULL
372382
#endif

refs/files-backend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2112,7 +2112,7 @@ static int create_ref_symlink(struct ref_lock *lock, const char *target)
21122112

21132113
ref_path = get_locked_file_path(&lock->lk);
21142114
unlink(ref_path);
2115-
ret = symlink(target, ref_path);
2115+
ret = create_symlink(NULL, target, ref_path);
21162116
free(ref_path);
21172117

21182118
if (ret)

setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,7 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
23002300
if (strbuf_readlink(&lnk, template_path->buf,
23012301
st_template.st_size) < 0)
23022302
die_errno(_("cannot readlink '%s'"), template_path->buf);
2303-
if (symlink(lnk.buf, path->buf))
2303+
if (create_symlink(NULL, lnk.buf, path->buf))
23042304
die_errno(_("cannot symlink '%s' '%s'"),
23052305
lnk.buf, path->buf);
23062306
strbuf_release(&lnk);
@@ -2579,7 +2579,7 @@ static int create_default_files(const char *template_path,
25792579
repo_git_path_replace(the_repository, &path, "tXXXXXX");
25802580
if (!close(xmkstemp(path.buf)) &&
25812581
!unlink(path.buf) &&
2582-
!symlink("testing", path.buf) &&
2582+
!create_symlink(NULL, "testing", path.buf) &&
25832583
!lstat(path.buf, &st1) &&
25842584
S_ISLNK(st1.st_mode))
25852585
unlink(path.buf); /* good */

0 commit comments

Comments
 (0)