diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:33:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:33:29 -0700 |
commit | 3e14384b126cf9911a35dfda21f04abd4199aa54 (patch) | |
tree | 6970fdb221b531fda063389f03db7b6d0fc7dbfb /commit.h | |
parent | 4291cc10e6b8f720570d612e9d54d5ecd57986c9 (diff) | |
parent | 7839632167bc6ceef20f28bd046f7001493b070f (diff) | |
download | git-3e14384b126cf9911a35dfda21f04abd4199aa54.tar.gz |
Merge branch 'jk/shallow-update-fix'
Serving objects from a shallow repository needs to write a
new file to hold the temporary shallow boundaries but it was not
cleaned when we exit due to die() or a signal.
* jk/shallow-update-fix:
shallow: verify shallow file after taking lock
shallow: automatically clean up shallow tempfiles
shallow: use stat_validity to check for up-to-date file
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -209,7 +209,7 @@ extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol, extern void setup_alternate_shallow(struct lock_file *shallow_lock, const char **alternate_shallow_file, const struct sha1_array *extra); -extern char *setup_temporary_shallow(const struct sha1_array *extra); +extern const char *setup_temporary_shallow(const struct sha1_array *extra); extern void advertise_shallow_grafts(int); struct shallow_info { |