From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Nov 2008 23:03:57 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~67
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6cd3729eae8d8945c0482423149163d40afd082c?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary

Conflicts:
RelNotes
---

6cd3729eae8d8945c0482423149163d40afd082c
diff --combined Documentation/git-check-attr.txt
index 256659a6b0,043274b1b7..8c2ac12f5d
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@@ -3,14 -3,12 +3,14 @@@ git-check-attr(1
  
  NAME
  ----
- git-check-attr - Display gitattributes information.
+ git-check-attr - Display gitattributes information
  
  
  SYNOPSIS
  --------
 +[verse]
  'git check-attr' attr... [--] pathname...
 +'git check-attr' --stdin [-z] attr... < <list-of-paths>
  
  DESCRIPTION
  -----------
@@@ -19,13 -17,6 +19,13 @@@ For every pathname, this command will l
  
  OPTIONS
  -------
 +--stdin::
 +	Read file names from stdin instead of from the command-line.
 +
 +-z::
 +	Only meaningful with `--stdin`; paths are separated with
 +	NUL character instead of LF.
 +
  \--::
  	Interpret all preceding arguments as attributes, and all following
  	arguments as path names. If not supplied, only the first argument will
diff --combined builtin-checkout.c
index 06904c3bd3,25845cdd5e..464fd25707
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -13,9 -13,6 +13,9 @@@
  #include "diff.h"
  #include "revision.h"
  #include "remote.h"
 +#include "blob.h"
 +#include "xdiff-interface.h"
 +#include "ll-merge.h"
  
  static const char * const checkout_usage[] = {
  	"git checkout [options] <branch>",
@@@ -23,18 -20,6 +23,18 @@@
  	NULL,
  };
  
 +struct checkout_opts {
 +	int quiet;
 +	int merge;
 +	int force;
 +	int writeout_stage;
 +	int writeout_error;
 +
 +	const char *new_branch;
 +	int new_branch_log;
 +	enum branch_track track;
 +};
 +
  static int post_checkout_hook(struct commit *old, struct commit *new,
  			      int changed)
  {
@@@ -99,121 -84,8 +99,121 @@@ static int skip_same_name(struct cache_
  	return pos;
  }
  
 +static int check_stage(int stage, struct cache_entry *ce, int pos)
 +{
 +	while (pos < active_nr &&
 +	       !strcmp(active_cache[pos]->name, ce->name)) {
 +		if (ce_stage(active_cache[pos]) == stage)
 +			return 0;
 +		pos++;
 +	}
 +	return error("path '%s' does not have %s version",
 +		     ce->name,
 +		     (stage == 2) ? "our" : "their");
 +}
 +
 +static int check_all_stages(struct cache_entry *ce, int pos)
 +{
 +	if (ce_stage(ce) != 1 ||
 +	    active_nr <= pos + 2 ||
 +	    strcmp(active_cache[pos+1]->name, ce->name) ||
 +	    ce_stage(active_cache[pos+1]) != 2 ||
 +	    strcmp(active_cache[pos+2]->name, ce->name) ||
 +	    ce_stage(active_cache[pos+2]) != 3)
 +		return error("path '%s' does not have all three versions",
 +			     ce->name);
 +	return 0;
 +}
 +
 +static int checkout_stage(int stage, struct cache_entry *ce, int pos,
 +			  struct checkout *state)
 +{
 +	while (pos < active_nr &&
 +	       !strcmp(active_cache[pos]->name, ce->name)) {
 +		if (ce_stage(active_cache[pos]) == stage)
 +			return checkout_entry(active_cache[pos], state, NULL);
 +		pos++;
 +	}
 +	return error("path '%s' does not have %s version",
 +		     ce->name,
 +		     (stage == 2) ? "our" : "their");
 +}
 +
 +/* NEEDSWORK: share with merge-recursive */
 +static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
 +{
 +	unsigned long size;
 +	enum object_type type;
 +
 +	if (!hashcmp(sha1, null_sha1)) {
 +		mm->ptr = xstrdup("");
 +		mm->size = 0;
 +		return;
 +	}
 +
 +	mm->ptr = read_sha1_file(sha1, &type, &size);
 +	if (!mm->ptr || type != OBJ_BLOB)
 +		die("unable to read blob object %s", sha1_to_hex(sha1));
 +	mm->size = size;
 +}
 +
 +static int checkout_merged(int pos, struct checkout *state)
 +{
 +	struct cache_entry *ce = active_cache[pos];
 +	const char *path = ce->name;
 +	mmfile_t ancestor, ours, theirs;
 +	int status;
 +	unsigned char sha1[20];
 +	mmbuffer_t result_buf;
 +
 +	if (ce_stage(ce) != 1 ||
 +	    active_nr <= pos + 2 ||
 +	    strcmp(active_cache[pos+1]->name, path) ||
 +	    ce_stage(active_cache[pos+1]) != 2 ||
 +	    strcmp(active_cache[pos+2]->name, path) ||
 +	    ce_stage(active_cache[pos+2]) != 3)
 +		return error("path '%s' does not have all 3 versions", path);
 +
 +	fill_mm(active_cache[pos]->sha1, &ancestor);
 +	fill_mm(active_cache[pos+1]->sha1, &ours);
 +	fill_mm(active_cache[pos+2]->sha1, &theirs);
 +
 +	status = ll_merge(&result_buf, path, &ancestor,
 +			  &ours, "ours", &theirs, "theirs", 1);
 +	free(ancestor.ptr);
 +	free(ours.ptr);
 +	free(theirs.ptr);
 +	if (status < 0 || !result_buf.ptr) {
 +		free(result_buf.ptr);
 +		return error("path '%s': cannot merge", path);
 +	}
 +
 +	/*
 +	 * NEEDSWORK:
 +	 * There is absolutely no reason to write this as a blob object
 +	 * and create a phoney cache entry just to leak.  This hack is
 +	 * primarily to get to the write_entry() machinery that massages
 +	 * the contents to work-tree format and writes out which only
 +	 * allows it for a cache entry.  The code in write_entry() needs
 +	 * to be refactored to allow us to feed a <buffer, size, mode>
 +	 * instead of a cache entry.  Such a refactoring would help
 +	 * merge_recursive as well (it also writes the merge result to the
 +	 * object database even when it may contain conflicts).
 +	 */
 +	if (write_sha1_file(result_buf.ptr, result_buf.size,
 +			    blob_type, sha1))
 +		die("Unable to add merge result for '%s'", path);
 +	ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode),
 +			      sha1,
 +			      path, 2, 0);
 +	if (!ce)
 +		die("make_cache_entry failed for path '%s'", path);
 +	status = checkout_entry(ce, state, NULL);
 +	return status;
 +}
  
 -static int checkout_paths(struct tree *source_tree, const char **pathspec)
 +static int checkout_paths(struct tree *source_tree, const char **pathspec,
 +			  struct checkout_opts *opts)
  {
  	int pos;
  	struct checkout state;
@@@ -222,8 -94,7 +222,8 @@@
  	int flag;
  	struct commit *head;
  	int errs = 0;
 -
 +	int stage = opts->writeout_stage;
 +	int merge = opts->merge;
  	int newfd;
  	struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
  
@@@ -251,16 -122,8 +251,16 @@@
  		if (pathspec_match(pathspec, NULL, ce->name, 0)) {
  			if (!ce_stage(ce))
  				continue;
 -			errs = 1;
 -			error("path '%s' is unmerged", ce->name);
 +			if (opts->force) {
 +				warning("path '%s' is unmerged", ce->name);
 +			} else if (stage) {
 +				errs |= check_stage(stage, ce, pos);
 +			} else if (opts->merge) {
 +				errs |= check_all_stages(ce, pos);
 +			} else {
 +				errs = 1;
 +				error("path '%s' is unmerged", ce->name);
 +			}
  			pos = skip_same_name(ce, pos) - 1;
  		}
  	}
@@@ -278,10 -141,6 +278,10 @@@
  				errs |= checkout_entry(ce, &state, NULL);
  				continue;
  			}
 +			if (stage)
 +				errs |= checkout_stage(stage, ce, pos, &state);
 +			else if (merge)
 +				errs |= checkout_merged(pos, &state);
  			pos = skip_same_name(ce, pos) - 1;
  		}
  	}
@@@ -310,7 -169,8 +310,7 @@@ static void show_local_changes(struct o
  
  static void describe_detached_head(char *msg, struct commit *commit)
  {
 -	struct strbuf sb;
 -	strbuf_init(&sb, 0);
 +	struct strbuf sb = STRBUF_INIT;
  	parse_commit(commit);
  	pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, NULL, NULL, 0, 0);
  	fprintf(stderr, "%s %s... %s\n", msg,
@@@ -318,6 -178,17 +318,6 @@@
  	strbuf_release(&sb);
  }
  
 -struct checkout_opts {
 -	int quiet;
 -	int merge;
 -	int force;
 -	int writeout_error;
 -
 -	char *new_branch;
 -	int new_branch_log;
 -	enum branch_track track;
 -};
 -
  static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree)
  {
  	struct unpack_trees_options opts;
@@@ -359,7 -230,8 +359,7 @@@ struct branch_info 
  
  static void setup_branch_path(struct branch_info *branch)
  {
 -	struct strbuf buf;
 -	strbuf_init(&buf, 0);
 +	struct strbuf buf = STRBUF_INIT;
  	strbuf_addstr(&buf, "refs/heads/");
  	strbuf_addstr(&buf, branch->name);
  	branch->path = strbuf_detach(&buf, NULL);
@@@ -397,8 -269,7 +397,7 @@@ static int merge_working_tree(struct ch
  		}
  
  		/* 2-way merge to the new branch */
- 		topts.initial_checkout = (!active_nr &&
- 					  (old->commit == new->commit));
+ 		topts.initial_checkout = is_cache_unborn();
  		topts.update = 1;
  		topts.merge = 1;
  		topts.gently = opts->merge;
@@@ -421,7 -292,6 +420,7 @@@
  			 */
  			struct tree *result;
  			struct tree *work;
 +			struct merge_options o;
  			if (!opts->merge)
  				return 1;
  			parse_commit(old->commit);
@@@ -440,17 -310,13 +439,17 @@@
  			 */
  
  			add_files_to_cache(NULL, NULL, 0);
 -			work = write_tree_from_memory();
 +			init_merge_options(&o);
 +			o.verbosity = 0;
 +			work = write_tree_from_memory(&o);
  
  			ret = reset_tree(new->commit->tree, opts, 1);
  			if (ret)
  				return ret;
 -			merge_trees(new->commit->tree, work, old->commit->tree,
 -				    new->name, "local", &result);
 +			o.branch1 = new->name;
 +			o.branch2 = "local";
 +			merge_trees(&o, new->commit->tree, work,
 +				old->commit->tree, &result);
  			ret = reset_tree(new->commit->tree, opts, 0);
  			if (ret)
  				return ret;
@@@ -482,7 -348,7 +481,7 @@@ static void update_refs_for_switch(stru
  				   struct branch_info *old,
  				   struct branch_info *new)
  {
 -	struct strbuf msg;
 +	struct strbuf msg = STRBUF_INIT;
  	const char *old_desc;
  	if (opts->new_branch) {
  		create_branch(old->name, opts->new_branch, new->name, 0,
@@@ -491,6 -357,7 +490,6 @@@
  		setup_branch_path(new);
  	}
  
 -	strbuf_init(&msg, 0);
  	old_desc = old->name;
  	if (!old_desc && old->commit)
  		old_desc = sha1_to_hex(old->commit->object.sha1);
@@@ -572,11 -439,6 +571,11 @@@ static int switch_branches(struct check
  	return ret || opts->writeout_error;
  }
  
 +static int git_checkout_config(const char *var, const char *value, void *cb)
 +{
 +	return git_xmerge_config(var, value, cb);
 +}
 +
  int cmd_checkout(int argc, const char **argv, const char *prefix)
  {
  	struct checkout_opts opts;
@@@ -584,21 -446,14 +583,21 @@@
  	const char *arg;
  	struct branch_info new;
  	struct tree *source_tree = NULL;
 +	char *conflict_style = NULL;
  	struct option options[] = {
  		OPT__QUIET(&opts.quiet),
  		OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
  		OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
  		OPT_SET_INT('t', "track",  &opts.track, "track",
  			BRANCH_TRACK_EXPLICIT),
 +		OPT_SET_INT('2', "ours", &opts.writeout_stage, "stage",
 +			    2),
 +		OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
 +			    3),
  		OPT_BOOLEAN('f', NULL, &opts.force, "force"),
 -		OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),
 +		OPT_BOOLEAN('m', "merge", &opts.merge, "merge"),
 +		OPT_STRING(0, "conflict", &conflict_style, "style",
 +			   "conflict style (merge or diff3)"),
  		OPT_END(),
  	};
  	int has_dash_dash;
@@@ -606,34 -461,15 +605,34 @@@
  	memset(&opts, 0, sizeof(opts));
  	memset(&new, 0, sizeof(new));
  
 -	git_config(git_default_config, NULL);
 +	git_config(git_checkout_config, NULL);
  
 -	opts.track = git_branch_track;
 +	opts.track = BRANCH_TRACK_UNSPECIFIED;
  
  	argc = parse_options(argc, argv, options, checkout_usage,
  			     PARSE_OPT_KEEP_DASHDASH);
  
 -	if (!opts.new_branch && (opts.track != git_branch_track))
 -		die("git checkout: --track and --no-track require -b");
 +	/* --track without -b should DWIM */
 +	if (0 < opts.track && !opts.new_branch) {
 +		const char *argv0 = argv[0];
 +		if (!argc || !strcmp(argv0, "--"))
 +			die ("--track needs a branch name");
 +		if (!prefixcmp(argv0, "refs/"))
 +			argv0 += 5;
 +		if (!prefixcmp(argv0, "remotes/"))
 +			argv0 += 8;
 +		argv0 = strchr(argv0, '/');
 +		if (!argv0 || !argv0[1])
 +			die ("Missing branch name; try -b");
 +		opts.new_branch = argv0 + 1;
 +	}
 +
 +	if (opts.track == BRANCH_TRACK_UNSPECIFIED)
 +		opts.track = git_branch_track;
 +	if (conflict_style) {
 +		opts.merge = 1; /* implied */
 +		git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
 +	}
  
  	if (opts.force && opts.merge)
  		die("git checkout: -f and -m are incompatible");
@@@ -717,22 -553,20 +716,22 @@@ no_reference
  			die("invalid path specification");
  
  		/* Checkout paths */
 -		if (opts.new_branch || opts.force || opts.merge) {
 +		if (opts.new_branch) {
  			if (argc == 1) {
 -				die("git checkout: updating paths is incompatible with switching branches/forcing\nDid you intend to checkout '%s' which can not be resolved as commit?", argv[0]);
 +				die("git checkout: updating paths is incompatible with switching branches.\nDid you intend to checkout '%s' which can not be resolved as commit?", argv[0]);
  			} else {
 -				die("git checkout: updating paths is incompatible with switching branches/forcing");
 +				die("git checkout: updating paths is incompatible with switching branches.");
  			}
  		}
  
 -		return checkout_paths(source_tree, pathspec);
 +		if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
 +			die("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index.");
 +
 +		return checkout_paths(source_tree, pathspec, &opts);
  	}
  
  	if (opts.new_branch) {
 -		struct strbuf buf;
 -		strbuf_init(&buf, 0);
 +		struct strbuf buf = STRBUF_INIT;
  		strbuf_addstr(&buf, "refs/heads/");
  		strbuf_addstr(&buf, opts.new_branch);
  		if (!get_sha1(buf.buf, rev))
@@@ -745,8 -579,6 +744,8 @@@
  	if (new.name && !new.commit) {
  		die("Cannot switch branch to a non-commit.");
  	}
 +	if (opts.writeout_stage)
 +		die("--ours/--theirs is incompatible with switching branches.");
  
  	return switch_branches(&opts, &new);
  }
diff --combined builtin-pack-objects.c
index 15b80db5a1,8fe51244e0..95e6faf1e6
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -245,8 -245,16 +245,16 @@@ static unsigned long write_object(struc
  	type = entry->type;
  
  	/* write limit if limited packsize and not first object */
- 	limit = pack_size_limit && nr_written ?
- 			pack_size_limit - write_offset : 0;
+ 	if (!pack_size_limit || !nr_written)
+ 		limit = 0;
+ 	else if (pack_size_limit <= write_offset)
+ 		/*
+ 		 * the earlier object did not fit the limit; avoid
+ 		 * mistaking this with unlimited (i.e. limit = 0).
+ 		 */
+ 		limit = 1;
+ 	else
+ 		limit = pack_size_limit - write_offset;
  
  	if (!entry->delta)
  		usable_delta = 0;	/* no delta */
@@@ -1369,10 -1377,12 +1377,10 @@@ static void find_deltas(struct object_e
  			int window, int depth, unsigned *processed)
  {
  	uint32_t i, idx = 0, count = 0;
 -	unsigned int array_size = window * sizeof(struct unpacked);
  	struct unpacked *array;
  	unsigned long mem_usage = 0;
  
 -	array = xmalloc(array_size);
 -	memset(array, 0, array_size);
 +	array = xcalloc(window, sizeof(struct unpacked));
  
  	for (;;) {
  		struct object_entry *entry;
@@@ -1724,14 -1734,6 +1732,14 @@@ static void prepare_pack(int window, in
  			if (entry->type < 0)
  				die("unable to get type of object %s",
  				    sha1_to_hex(entry->idx.sha1));
 +		} else {
 +			if (entry->type < 0) {
 +				/*
 +				 * This object is not found, but we
 +				 * don't have to include it anyway.
 +				 */
 +				continue;
 +			}
  		}
  
  		delta_list[n++] = entry;
diff --combined cache.h
index eda7028992,3960931a95..6be60ea3ff
--- a/cache.h
+++ b/cache.h
@@@ -6,14 -6,8 +6,14 @@@
  #include "hash.h"
  
  #include SHA1_HEADER
 -#include <zlib.h>
 +#ifndef git_SHA_CTX
 +#define git_SHA_CTX	SHA_CTX
 +#define git_SHA1_Init	SHA1_Init
 +#define git_SHA1_Update	SHA1_Update
 +#define git_SHA1_Final	SHA1_Final
 +#endif
  
 +#include <zlib.h>
  #if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
  #define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
  #endif
@@@ -132,7 -126,6 +132,7 @@@ struct cache_entry 
  
  #define CE_NAMEMASK  (0x0fff)
  #define CE_STAGEMASK (0x3000)
 +#define CE_EXTENDED  (0x4000)
  #define CE_VALID     (0x8000)
  #define CE_STAGESHIFT 12
  
@@@ -262,6 -255,7 +262,7 @@@ static inline void remove_name_hash(str
  
  #define read_cache() read_index(&the_index)
  #define read_cache_from(path) read_index_from(&the_index, (path))
+ #define is_cache_unborn() is_index_unborn(&the_index)
  #define read_cache_unmerged() read_index_unmerged(&the_index)
  #define write_cache(newfd, cache, entries) write_index(&the_index, (newfd))
  #define discard_cache() discard_index(&the_index)
@@@ -320,7 -314,6 +321,7 @@@ extern int is_bare_repository(void)
  extern int is_inside_git_dir(void);
  extern char *git_work_tree_cfg;
  extern int is_inside_work_tree(void);
 +extern int have_git_dir(void);
  extern const char *get_git_dir(void);
  extern char *get_object_directory(void);
  extern char *get_index_file(void);
@@@ -368,6 -361,7 +369,7 @@@ extern int init_db(const char *template
  /* Initialize and use the cache information */
  extern int read_index(struct index_state *);
  extern int read_index_from(struct index_state *, const char *path);
+ extern int is_index_unborn(struct index_state *);
  extern int read_index_unmerged(struct index_state *);
  extern int write_index(const struct index_state *, int newfd);
  extern int discard_index(struct index_state *);
@@@ -379,7 -373,6 +381,7 @@@ extern int index_name_pos(const struct 
  #define ADD_CACHE_OK_TO_REPLACE 2	/* Ok to replace file/directory */
  #define ADD_CACHE_SKIP_DFCHECK 4	/* Ok to skip DF conflict checks */
  #define ADD_CACHE_JUST_APPEND 8		/* Append only; tree.c::read_tree() */
 +#define ADD_CACHE_NEW_ONLY 16		/* Do not replace existing ones */
  extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
  extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
  extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
@@@ -388,8 -381,6 +390,8 @@@ extern int remove_file_from_index(struc
  #define ADD_CACHE_VERBOSE 1
  #define ADD_CACHE_PRETEND 2
  #define ADD_CACHE_IGNORE_ERRORS	4
 +#define ADD_CACHE_IGNORE_REMOVAL 8
 +#define ADD_CACHE_INTENT 16
  extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
  extern int add_file_to_index(struct index_state *, const char *path, int flags);
  extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
@@@ -405,6 -396,7 +407,6 @@@ extern int ie_modified(const struct ind
  
  extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
  extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
 -extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
  extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
  extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
  
@@@ -466,7 -458,6 +468,7 @@@ enum safe_crlf 
  extern enum safe_crlf safe_crlf;
  
  enum branch_track {
 +	BRANCH_TRACK_UNSPECIFIED = -1,
  	BRANCH_TRACK_NEVER = 0,
  	BRANCH_TRACK_REMOTE,
  	BRANCH_TRACK_ALWAYS,
@@@ -526,7 -517,6 +528,7 @@@ static inline void hashclr(unsigned cha
  {
  	memset(hash, 0, 20);
  }
 +extern int is_empty_blob_sha1(const unsigned char *sha1);
  
  int git_mkstemp(char *path, size_t n, const char *template);
  
@@@ -554,7 -544,6 +556,7 @@@ static inline int is_absolute_path(cons
  {
  	return path[0] == '/' || has_dos_drive_prefix(path);
  }
 +int is_directory(const char *);
  const char *make_absolute_path(const char *path);
  const char *make_nonrelative_path(const char *path);
  const char *make_relative_path(const char *abs, const char *base);
@@@ -662,8 -651,6 +664,8 @@@ extern struct alternate_object_databas
  } *alt_odb_list;
  extern void prepare_alt_odb(void);
  extern void add_to_alternates_file(const char *reference);
 +typedef int alt_odb_fn(struct alternate_object_database *, void *);
 +extern void foreach_alt_odb(alt_odb_fn, void*);
  
  struct pack_window {
  	struct pack_window *next;
@@@ -732,11 -719,7 +734,11 @@@ extern struct child_process *git_connec
  extern int finish_connect(struct child_process *conn);
  extern int path_match(const char *path, int nr, char **match);
  extern int get_ack(int fd, unsigned char *result_sha1);
 -extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags);
 +struct extra_have_objects {
 +	int nr, alloc;
 +	unsigned char (*array)[20];
 +};
 +extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);
  extern int server_supports(const char *feature);
  
  extern struct packed_git *parse_pack_index(unsigned char *sha1);
@@@ -770,6 -753,7 +772,6 @@@ typedef int (*config_fn_t)(const char *
  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(config_fn_t fn, void *);
 -extern int git_parse_long(const char *, long *);
  extern int git_parse_ulong(const char *, unsigned long *);
  extern int git_config_int(const char *, const char *);
  extern unsigned long git_config_ulong(const char *, const char *);
diff --combined read-cache.c
index 2c450866ce,525d138e90..22a814311d
--- a/read-cache.c
+++ b/read-cache.c
@@@ -8,12 -8,6 +8,12 @@@
  #include "cache-tree.h"
  #include "refs.h"
  #include "dir.h"
 +#include "tree.h"
 +#include "commit.h"
 +#include "diff.h"
 +#include "diffcore.h"
 +#include "revision.h"
 +#include "blob.h"
  
  /* Index extensions.
   *
@@@ -160,7 -154,7 +160,7 @@@ static int ce_modified_check_fs(struct 
  	return 0;
  }
  
 -static int is_empty_blob_sha1(const unsigned char *sha1)
 +int is_empty_blob_sha1(const unsigned char *sha1)
  {
  	static const unsigned char empty_blob_sha1[20] = {
  		0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
@@@ -512,14 -506,6 +512,14 @@@ static struct cache_entry *create_alias
  	return new;
  }
  
 +static void record_intent_to_add(struct cache_entry *ce)
 +{
 +	unsigned char sha1[20];
 +	if (write_sha1_file("", 0, blob_type, sha1))
 +		die("cannot create an empty blob in the object database");
 +	hashcpy(ce->sha1, sha1);
 +}
 +
  int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
  {
  	int size, namelen, was_same;
@@@ -528,9 -514,6 +528,9 @@@
  	unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
  	int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
  	int pretend = flags & ADD_CACHE_PRETEND;
 +	int intent_only = flags & ADD_CACHE_INTENT;
 +	int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
 +			  (intent_only ? ADD_CACHE_NEW_ONLY : 0));
  
  	if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
  		return error("%s: can only add regular files, symbolic links or git-directories", path);
@@@ -544,8 -527,7 +544,8 @@@
  	ce = xcalloc(1, size);
  	memcpy(ce->name, path, namelen);
  	ce->ce_flags = namelen;
 -	fill_stat_cache_info(ce, st);
 +	if (!intent_only)
 +		fill_stat_cache_info(ce, st);
  
  	if (trust_executable_bit && has_symlinks)
  		ce->ce_mode = create_ce_mode(st_mode);
@@@ -568,12 -550,8 +568,12 @@@
  		alias->ce_flags |= CE_ADDED;
  		return 0;
  	}
 -	if (index_path(ce->sha1, path, st, 1))
 -		return error("unable to index file %s", path);
 +	if (!intent_only) {
 +		if (index_path(ce->sha1, path, st, 1))
 +			return error("unable to index file %s", path);
 +	} else
 +		record_intent_to_add(ce);
 +
  	if (ignore_case && alias && different_name(ce, alias))
  		ce = create_alias_ce(ce, alias);
  	ce->ce_flags |= CE_ADDED;
@@@ -586,7 -564,7 +586,7 @@@
  
  	if (pretend)
  		;
 -	else if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
 +	else if (add_index_entry(istate, ce, add_option))
  		return error("unable to add %s to index",path);
  	if (verbose && !was_same)
  		printf("add '%s'\n", path);
@@@ -608,10 -586,8 +608,10 @@@ struct cache_entry *make_cache_entry(un
  	int size, len;
  	struct cache_entry *ce;
  
 -	if (!verify_path(path))
 +	if (!verify_path(path)) {
 +		error("Invalid path '%s'", path);
  		return NULL;
 +	}
  
  	len = strlen(path);
  	size = cache_entry_size(len);
@@@ -867,15 -843,13 +867,15 @@@ static int add_index_entry_with_check(s
  	int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
  	int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
  	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
 +	int new_only = option & ADD_CACHE_NEW_ONLY;
  
  	cache_tree_invalidate_path(istate->cache_tree, ce->name);
  	pos = index_name_pos(istate, ce->name, ce->ce_flags);
  
  	/* existing match? Just replace it. */
  	if (pos >= 0) {
 -		replace_index_entry(istate, pos, ce);
 +		if (!new_only)
 +			replace_index_entry(istate, pos, ce);
  		return 0;
  	}
  	pos = -pos-1;
@@@ -895,7 -869,7 +895,7 @@@
  	if (!ok_to_add)
  		return -1;
  	if (!verify_path(ce->name))
 -		return -1;
 +		return error("Invalid path '%s'", ce->name);
  
  	if (!skip_df_check &&
  	    check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
@@@ -1093,16 -1067,16 +1093,16 @@@ struct cache_entry *refresh_cache_entry
  
  static int verify_hdr(struct cache_header *hdr, unsigned long size)
  {
 -	SHA_CTX c;
 +	git_SHA_CTX c;
  	unsigned char sha1[20];
  
  	if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
  		return error("bad signature");
  	if (hdr->hdr_version != htonl(2))
  		return error("bad index version");
 -	SHA1_Init(&c);
 -	SHA1_Update(&c, hdr, size - 20);
 -	SHA1_Final(sha1, &c);
 +	git_SHA1_Init(&c);
 +	git_SHA1_Update(&c, hdr, size - 20);
 +	git_SHA1_Final(sha1, &c);
  	if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
  		return error("bad index file sha1 signature");
  	return 0;
@@@ -1144,10 -1118,6 +1144,10 @@@ static void convert_from_disk(struct on
  	ce->ce_size  = ntohl(ondisk->size);
  	/* On-disk flags are just 16 bits */
  	ce->ce_flags = ntohs(ondisk->flags);
 +
 +	/* For future extension: we do not understand this entry yet */
 +	if (ce->ce_flags & CE_EXTENDED)
 +		die("Unknown index entry format");
  	hashcpy(ce->sha1, ondisk->sha1);
  
  	len = ce->ce_flags & CE_NAMEMASK;
@@@ -1269,6 -1239,11 +1269,11 @@@ unmap
  	die("index file corrupt");
  }
  
+ int is_index_unborn(struct index_state *istate)
+ {
+ 	return (!istate->cache_nr && !istate->alloc && !istate->timestamp);
+ }
+ 
  int discard_index(struct index_state *istate)
  {
  	istate->cache_nr = 0;
@@@ -1299,11 -1274,11 +1304,11 @@@ int unmerged_index(const struct index_s
  static unsigned char write_buffer[WRITE_BUFFER_SIZE];
  static unsigned long write_buffer_len;
  
 -static int ce_write_flush(SHA_CTX *context, int fd)
 +static int ce_write_flush(git_SHA_CTX *context, int fd)
  {
  	unsigned int buffered = write_buffer_len;
  	if (buffered) {
 -		SHA1_Update(context, write_buffer, buffered);
 +		git_SHA1_Update(context, write_buffer, buffered);
  		if (write_in_full(fd, write_buffer, buffered) != buffered)
  			return -1;
  		write_buffer_len = 0;
@@@ -1311,7 -1286,7 +1316,7 @@@
  	return 0;
  }
  
 -static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
 +static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
  {
  	while (len) {
  		unsigned int buffered = write_buffer_len;
@@@ -1333,7 -1308,7 +1338,7 @@@
  	return 0;
  }
  
 -static int write_index_ext_header(SHA_CTX *context, int fd,
 +static int write_index_ext_header(git_SHA_CTX *context, int fd,
  				  unsigned int ext, unsigned int sz)
  {
  	ext = htonl(ext);
@@@ -1342,13 -1317,13 +1347,13 @@@
  		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
  }
  
 -static int ce_flush(SHA_CTX *context, int fd)
 +static int ce_flush(git_SHA_CTX *context, int fd)
  {
  	unsigned int left = write_buffer_len;
  
  	if (left) {
  		write_buffer_len = 0;
 -		SHA1_Update(context, write_buffer, left);
 +		git_SHA1_Update(context, write_buffer, left);
  	}
  
  	/* Flush first if not enough space for SHA1 signature */
@@@ -1359,7 -1334,7 +1364,7 @@@
  	}
  
  	/* Append the SHA1 signature at the end */
 -	SHA1_Final(write_buffer + left, context);
 +	git_SHA1_Final(write_buffer + left, context);
  	left += 20;
  	return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
  }
@@@ -1413,7 -1388,7 +1418,7 @@@ static void ce_smudge_racily_clean_entr
  	}
  }
  
 -static int ce_write_entry(SHA_CTX *c, int fd, struct cache_entry *ce)
 +static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
  {
  	int size = ondisk_ce_size(ce);
  	struct ondisk_cache_entry *ondisk = xcalloc(1, size);
@@@ -1437,7 -1412,7 +1442,7 @@@
  
  int write_index(const struct index_state *istate, int newfd)
  {
 -	SHA_CTX c;
 +	git_SHA_CTX c;
  	struct cache_header hdr;
  	int i, err, removed;
  	struct cache_entry **cache = istate->cache;
@@@ -1451,7 -1426,7 +1456,7 @@@
  	hdr.hdr_version = htonl(2);
  	hdr.hdr_entries = htonl(entries - removed);
  
 -	SHA1_Init(&c);
 +	git_SHA1_Init(&c);
  	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
  		return -1;
  
@@@ -1467,8 -1442,9 +1472,8 @@@
  
  	/* Write extension data here */
  	if (istate->cache_tree) {
 -		struct strbuf sb;
 +		struct strbuf sb = STRBUF_INIT;
  
 -		strbuf_init(&sb, 0);
  		cache_tree_write(&sb, istate->cache_tree);
  		err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
  			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
@@@ -1515,61 -1491,6 +1520,61 @@@ int read_index_unmerged(struct index_st
  	return unmerged;
  }
  
 +struct update_callback_data
 +{
 +	int flags;
 +	int add_errors;
 +};
 +
 +static void update_callback(struct diff_queue_struct *q,
 +			    struct diff_options *opt, void *cbdata)
 +{
 +	int i;
 +	struct update_callback_data *data = cbdata;
 +
 +	for (i = 0; i < q->nr; i++) {
 +		struct diff_filepair *p = q->queue[i];
 +		const char *path = p->one->path;
 +		switch (p->status) {
 +		default:
 +			die("unexpected diff status %c", p->status);
 +		case DIFF_STATUS_UNMERGED:
 +		case DIFF_STATUS_MODIFIED:
 +		case DIFF_STATUS_TYPE_CHANGED:
 +			if (add_file_to_index(&the_index, path, data->flags)) {
 +				if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
 +					die("updating files failed");
 +				data->add_errors++;
 +			}
 +			break;
 +		case DIFF_STATUS_DELETED:
 +			if (data->flags & ADD_CACHE_IGNORE_REMOVAL)
 +				break;
 +			if (!(data->flags & ADD_CACHE_PRETEND))
 +				remove_file_from_index(&the_index, path);
 +			if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
 +				printf("remove '%s'\n", path);
 +			break;
 +		}
 +	}
 +}
 +
 +int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
 +{
 +	struct update_callback_data data;
 +	struct rev_info rev;
 +	init_revisions(&rev, prefix);
 +	setup_revisions(0, NULL, &rev, NULL);
 +	rev.prune_data = pathspec;
 +	rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
 +	rev.diffopt.format_callback = update_callback;
 +	data.flags = flags;
 +	data.add_errors = 0;
 +	rev.diffopt.format_callback_data = &data;
 +	run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
 +	return !!data.add_errors;
 +}
 +
  /*
   * Returns 1 if the path is an "other" path with respect to
   * the index; that is, the path is not mentioned in the index at all,
diff --combined t/t5300-pack-object.sh
index b335c6b42d,2852a03265..04522857ab
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@@ -272,8 -272,7 +272,8 @@@ test_expect_success 
  
  test_expect_success \
      'make sure index-pack detects the SHA1 collision' \
 -    'test_must_fail git index-pack -o bad.idx test-3.pack'
 +    'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
 +     grep "SHA1 COLLISION FOUND" msg'
  
  test_expect_success \
      'honor pack.packSizeLimit' \
@@@ -376,4 -375,10 +376,10 @@@ test_expect_success 'index-pack with --
  	)
  '
  
+ test_expect_success 'tolerate absurdly small packsizelimit' '
+ 	git config pack.packSizeLimit 2 &&
+ 	packname_9=$(git pack-objects test-9 <obj-list) &&
+ 	test $(wc -l <obj-list) = $(ls test-9-*.pack | wc -l)
+ '
+ 
  test_done