aboutsummaryrefslogtreecommitdiff
path: root/archive.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-07-14 21:22:29 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-15 07:18:04 -0700
commit1d11d5bb85daf38aa1eb6ecd2387dff862181812 (patch)
tree440c343165f1ea01f5d94fb8ec90b0df918252e6 /archive.h
parent562e25abea9f1f2d443053279c009a88d81a592b (diff)
downloadgit-1d11d5bb85daf38aa1eb6ecd2387dff862181812.tar.gz
git-1d11d5bb85daf38aa1eb6ecd2387dff862181812.tar.xz
archive: unify file attribute handling
Now that all file attribute handling for git archive has moved to archive.c, we can unexport sha1_file_to_archive() and is_archive_path_ignored() even disappears. Add setup_archive_check(), modelled after similar functions used in the code of other commands that support multiple file attributes. Also remove convert_to_archive(), as it's only remaining function with attribute handling gone was to call format_subst() if commit was not NULL, which is now checked in sha1_file_to_archive(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.h')
-rw-r--r--archive.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/archive.h b/archive.h
index 4e44549fd..88ee3be54 100644
--- a/archive.h
+++ b/archive.h
@@ -43,9 +43,6 @@ extern int write_tar_archive(struct archiver_args *);
extern int write_zip_archive(struct archiver_args *);
extern void *parse_extra_zip_args(int argc, const char **argv);
-extern void *sha1_file_to_archive(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size, const struct commit *commit);
-extern int is_archive_path_ignored(const char *path);
-
extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
#endif /* ARCHIVE_H */