From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 May 2008 21:05:09 +0000 (-0700)
Subject: Merge branch 'js/mailinfo'
X-Git-Tag: v1.5.6-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc26efb3134b28701fe65ac488af2c6abf59b21d?ds=inline;hp=-c

Merge branch 'js/mailinfo'

* js/mailinfo:
mailsplit: minor clean-up in read_line_with_nul()
mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths
mailsplit and mailinfo: gracefully handle NUL characters
---

cc26efb3134b28701fe65ac488af2c6abf59b21d
diff --combined builtin.h
index 23a90ded7d,48f1332001..8bda1117e4
--- a/builtin.h
+++ b/builtin.h
@@@ -9,6 -9,7 +9,7 @@@ extern const char git_usage_string[]
  extern void list_common_cmds_help(void);
  extern void help_unknown_cmd(const char *cmd);
  extern void prune_packed_objects(int);
+ extern int read_line_with_nul(char *buf, int size, FILE *file);
  
  extern int cmd_add(int argc, const char **argv, const char *prefix);
  extern int cmd_annotate(int argc, const char **argv, const char *prefix);
@@@ -24,7 -25,6 +25,7 @@@ extern int cmd_check_attr(int argc, con
  extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
  extern int cmd_cherry(int argc, const char **argv, const char *prefix);
  extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
 +extern int cmd_clone(int argc, const char **argv, const char *prefix);
  extern int cmd_clean(int argc, const char **argv, const char *prefix);
  extern int cmd_commit(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);