aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 02:26:24 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-07 02:26:24 -0700
commitee9693e246669f48f6b058a1044cefa973a44c22 (patch)
tree80f0985cb14b578e9d13c04ad39a47dd8eccb3a2 /cache.h
parent39415449ee9b0bfbd6026e38c6e5d43f99759bf2 (diff)
parent5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8 (diff)
downloadgit-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 'cache.h')
-rw-r--r--cache.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index ece0c041f..1b50c32b1 100644
--- a/cache.h
+++ b/cache.h
@@ -211,6 +211,11 @@ struct lock_file {
};
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *);
+
+extern int hold_locked_index(struct lock_file *, int);
+extern int commit_locked_index(struct lock_file *);
+extern void set_alternate_index_output(const char *);
+
extern void rollback_lock_file(struct lock_file *);
extern int delete_ref(const char *, unsigned char *sha1);