diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 02:26:24 -0700 |
| commit | ee9693e246669f48f6b058a1044cefa973a44c22 (patch) | |
| tree | 80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /builtin-checkout-index.c | |
| parent | 39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff) | |
| parent | 5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff) | |
| download | git-ee9693e246669f48f6b058a1044cefa973a44c22.tar.gz git-ee9693e246669f48f6b058a1044cefa973a44c22.tar.xz | |
Merge branch 'jc/index-output'
* jc/index-output:
git-read-tree --index-output=<file>
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
Conflicts:
builtin-apply.c
Diffstat (limited to 'builtin-checkout-index.c')
| -rw-r--r-- | builtin-checkout-index.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c index afe4b0e45..8460f97b6 100644 --- a/builtin-checkout-index.c +++ b/builtin-checkout-index.c @@ -202,10 +202,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) if (!strcmp(arg, "-u") || !strcmp(arg, "--index")) { state.refresh_cache = 1; if (newfd < 0) - newfd = hold_lock_file_for_update - (&lock_file, get_index_file(), 1); - if (newfd < 0) - die("cannot open index.lock file."); + newfd = hold_locked_index(&lock_file, 1); continue; } if (!strcmp(arg, "-z")) { @@ -302,7 +299,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) if (0 <= newfd && (write_cache(newfd, active_cache, active_nr) || - close(newfd) || commit_lock_file(&lock_file))) + close(newfd) || commit_locked_index(&lock_file))) die("Unable to write new index file"); return 0; } |