diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-21 22:53:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-21 22:53:36 -0700 |
| commit | 2990034f1ed2c3d85d23d5611a1f04d317f785ac (patch) | |
| tree | b279df7a87a679a74c942f1c32d42681f9317f4b /git-compat-util.h | |
| parent | bf0fe35c938ac9f03d1369600b0c76e428a57507 (diff) | |
| parent | 2c626e5fa8a46f647b88fb32d7b28d573e8631bf (diff) | |
| download | git-2990034f1ed2c3d85d23d5611a1f04d317f785ac.tar.gz | |
Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1
* jc/maint-1.6.0-pack-directory:
Fix odb_mkstemp() on AIX
Make sure objects/pack exists before creating a new pack
Conflicts:
wrapper.c
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index e20b1e858c..124bb94b15 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -303,6 +303,8 @@ extern ssize_t xwrite(int fd, const void *buf, size_t len); extern int xdup(int fd); extern FILE *xfdopen(int fd, const char *mode); extern int xmkstemp(char *template); +extern int odb_mkstemp(char *template, size_t limit, const char *pattern); +extern int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1); static inline size_t xsize_t(off_t len) { |