From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Aug 2016 16:47:36 +0000 (-0700)
Subject: Merge branch 'jk/trace-fixup'
X-Git-Tag: v2.10.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d4960ac7d360744fe5bac39cb90697d81128565?ds=sidebyside;hp=-c

Merge branch 'jk/trace-fixup'

Various small fixups to the "GIT_TRACE" facility.

* jk/trace-fixup:
trace: do not fall back to stderr
write_or_die: drop write_or_whine_pipe()
trace: disable key after write error
trace: correct variable name in write() error message
trace: cosmetic fixes for error messages
trace: use warning() for printing trace errors
trace: stop using write_or_whine_pipe()
trace: handle NULL argument in trace_disable()
---

6d4960ac7d360744fe5bac39cb90697d81128565
diff --combined cache.h
index 95a0bd397a,388591157c..b780a91a56
--- a/cache.h
+++ b/cache.h
@@@ -1230,8 -1230,7 +1230,8 @@@ struct date_mode 
  		DATE_ISO8601_STRICT,
  		DATE_RFC2822,
  		DATE_STRFTIME,
 -		DATE_RAW
 +		DATE_RAW,
 +		DATE_UNIX
  	} type;
  	const char *strftime_fmt;
  	int local;
@@@ -1270,7 -1269,6 +1270,7 @@@ extern const char *ident_default_email(
  extern const char *git_editor(void);
  extern const char *git_pager(int stdout_is_tty);
  extern int git_ident_config(const char *, const char *, void *);
 +extern void reset_ident_date(void);
  
  struct ident_split {
  	const char *name_begin;
@@@ -1379,13 -1377,6 +1379,13 @@@ extern struct packed_git 
  	char pack_name[FLEX_ARRAY]; /* more */
  } *packed_git;
  
 +/*
 + * A most-recently-used ordered version of the packed_git list, which can
 + * be iterated instead of packed_git (and marked via mru_mark).
 + */
 +struct mru;
 +extern struct mru *packed_git_mru;
 +
  struct pack_entry {
  	off_t offset;
  	unsigned char sha1[20];
@@@ -1425,6 -1416,7 +1425,6 @@@ extern unsigned char *use_pack(struct p
  extern void close_pack_windows(struct packed_git *);
  extern void close_all_packs(void);
  extern void unuse_pack(struct pack_window **);
 -extern void free_pack_by_name(const char *);
  extern void clear_delta_base_cache(void);
  extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
  
@@@ -1574,18 -1566,10 +1574,18 @@@ struct git_config_source 
  	const char *blob;
  };
  
 +enum config_origin_type {
 +	CONFIG_ORIGIN_BLOB,
 +	CONFIG_ORIGIN_FILE,
 +	CONFIG_ORIGIN_STDIN,
 +	CONFIG_ORIGIN_SUBMODULE_BLOB,
 +	CONFIG_ORIGIN_CMDLINE
 +};
 +
  typedef int (*config_fn_t)(const char *, const char *, void *);
  extern int git_default_config(const char *, const char *, void *);
  extern int git_config_from_file(config_fn_t fn, const char *, void *);
 -extern int git_config_from_mem(config_fn_t fn, const char *origin_type,
 +extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
  					const char *name, const char *buf, size_t len, void *data);
  extern void git_config_push_parameter(const char *text);
  extern int git_config_from_parameters(config_fn_t fn, void *data);
@@@ -1729,7 -1713,7 +1729,7 @@@ extern int ignore_untracked_cache_confi
  struct key_value_info {
  	const char *filename;
  	int linenr;
 -	const char *origin_type;
 +	enum config_origin_type origin_type;
  	enum config_scope scope;
  };
  
@@@ -1756,7 -1740,6 +1756,6 @@@ extern int copy_file(const char *dst, c
  extern int copy_file_with_time(const char *dst, const char *src, int mode);
  
  extern void write_or_die(int fd, const void *buf, size_t count);
- extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
  extern void fsync_or_die(int fd, const char *);
  
  extern ssize_t read_in_full(int fd, void *buf, size_t count);