Skip to content

Commit a8599be

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 <[email protected]>
1 parent 6b801b6 commit a8599be

File tree

9 files changed

+20
-9
lines changed

9 files changed

+20
-9
lines changed

apply.c

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

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

builtin/difftool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
497497
}
498498
add_path(&wtdir, wtdir_len, dst_path);
499499
if (symlinks) {
500-
if (symlink(wtdir.buf, rdir.buf)) {
500+
if (create_symlink(lstate.istate, wtdir.buf, rdir.buf)) {
501501
ret = error_errno("could not symlink '%s' to '%s'", wtdir.buf, rdir.buf);
502502
goto finish;
503503
}

builtin/init-db.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
7676
if (strbuf_readlink(&lnk, template_path->buf,
7777
st_template.st_size) < 0)
7878
die_errno(_("cannot readlink '%s'"), template_path->buf);
79-
if (symlink(lnk.buf, path->buf))
79+
if (create_symlink(NULL, lnk.buf, path->buf))
8080
die_errno(_("cannot symlink '%s' '%s'"),
8181
lnk.buf, path->buf);
8282
strbuf_release(&lnk);
@@ -280,7 +280,7 @@ static int create_default_files(const char *template_path,
280280
path = git_path_buf(&buf, "tXXXXXX");
281281
if (!close(xmkstemp(path)) &&
282282
!unlink(path) &&
283-
!symlink("testing", path) &&
283+
!create_symlink(NULL, "testing", path) &&
284284
!lstat(path, &st1) &&
285285
S_ISLNK(st1.st_mode))
286286
unlink(path); /* good */

compat/mingw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,7 @@ int link(const char *oldpath, const char *newpath)
24032403
return 0;
24042404
}
24052405

2406-
int symlink(const char *target, const char *link)
2406+
int mingw_create_symlink(struct index_state *index, const char *target, const char *link)
24072407
{
24082408
wchar_t wtarget[MAX_LONG_PATH], wlink[MAX_LONG_PATH];
24092409
int len;

compat/mingw.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,10 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
213213
int sigaction(int sig, struct sigaction *in, struct sigaction *out);
214214
int link(const char *oldpath, const char *newpath);
215215
int uname(struct utsname *buf);
216-
int symlink(const char *target, const char *link);
217216
int readlink(const char *path, char *buf, size_t bufsiz);
217+
struct index_state;
218+
int mingw_create_symlink(struct index_state *index, const char *target, const char *link);
219+
#define create_symlink mingw_create_symlink
218220

219221
/*
220222
* replacements of existing functions

entry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ static int write_entry(struct cache_entry *ce,
289289
if (!has_symlinks || to_tempfile)
290290
goto write_file_entry;
291291

292-
ret = symlink(new_blob, path);
292+
ret = create_symlink(state->istate, new_blob, path);
293293
free(new_blob);
294294
if (ret)
295295
return error_errno("unable to create symlink %s", path);

git-compat-util.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,15 @@ static inline char *git_find_last_dir_sep(const char *path)
406406
#define find_last_dir_sep git_find_last_dir_sep
407407
#endif
408408

409+
#ifndef create_symlink
410+
struct index_state;
411+
static inline int git_create_symlink(struct index_state *index, const char *target, const char *link)
412+
{
413+
return symlink(target, link);
414+
}
415+
#define create_symlink git_create_symlink
416+
#endif
417+
409418
#ifndef query_user_email
410419
#define query_user_email() NULL
411420
#endif

merge-recursive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ static int update_file_flags(struct merge_options *opt,
970970
char *lnk = xmemdupz(buf, size);
971971
safe_create_leading_directories_const(path);
972972
unlink(path);
973-
if (symlink(lnk, path))
973+
if (create_symlink(&opt->orig_index, lnk, path))
974974
ret = err(opt, _("failed to symlink '%s': %s"),
975975
path, strerror(errno));
976976
free(lnk);

refs/files-backend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ static int create_ref_symlink(struct ref_lock *lock, const char *target)
17921792
#ifndef NO_SYMLINK_HEAD
17931793
char *ref_path = get_locked_file_path(&lock->lk);
17941794
unlink(ref_path);
1795-
ret = symlink(target, ref_path);
1795+
ret = create_symlink(NULL, target, ref_path);
17961796
free(ref_path);
17971797

17981798
if (ret)

0 commit comments

Comments
 (0)