diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-12 00:23:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-12 00:23:39 +0300 |
commit | 68a2e6a2c80303144807c8c91a087427e3c8e727 (patch) | |
tree | 96f1e79d314e0250141fe7bc88995361ebd21c18 /builtin/init-db.c | |
parent | 17c7f4d8e4e0e54148f77db4cf73e07aae484ae9 (diff) | |
parent | 562bc080934b1bd16099723e80cc82a0dc6356b7 (diff) |
Merge branch 'nd/multiple-work-trees'
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
* nd/multiple-work-trees: (41 commits)
prune --worktrees: fix expire vs worktree existence condition
t1501: fix test with split index
t2026: fix broken &&-chain
t2026 needs procondition SANITY
git-checkout.txt: a note about multiple checkout support for submodules
checkout: add --ignore-other-wortrees
checkout: pass whole struct to parse_branchname_arg instead of individual flags
git-common-dir: make "modules/" per-working-directory directory
checkout: do not fail if target is an empty directory
t2025: add a test to make sure grafts is working from a linked checkout
checkout: don't require a work tree when checking out into a new one
git_path(): keep "info/sparse-checkout" per work-tree
count-objects: report unused files in $GIT_DIR/worktrees/...
gc: support prune --worktrees
gc: factor out gc.pruneexpire parsing code
gc: style change -- no SP before closing parenthesis
checkout: clean up half-prepared directories in --to mode
checkout: reject if the branch is already checked out elsewhere
prune: strategies for linked checkouts
checkout: support checking out into a new working directory
...
Diffstat (limited to 'builtin/init-db.c')
-rw-r--r-- | builtin/init-db.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index ab9f86b889..4335738135 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -362,7 +362,6 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir, static void separate_git_dir(const char *git_dir) { struct stat st; - FILE *fp; if (!stat(git_link, &st)) { const char *src; @@ -378,11 +377,7 @@ static void separate_git_dir(const char *git_dir) die_errno(_("unable to move %s to %s"), src, git_dir); } - fp = fopen(git_link, "w"); - if (!fp) - die(_("Could not create git link %s"), git_link); - fprintf(fp, "gitdir: %s\n", git_dir); - fclose(fp); + write_file(git_link, 1, "gitdir: %s\n", git_dir); } int init_db(const char *template_dir, unsigned int flags) |