From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Feb 2007 00:50:32 +0000 (-0800)
Subject: Merge branch 'jc/merge-base' (early part)
X-Git-Tag: v1.5.1-rc1~299
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a164d48df6bb1b4a771741c63d4437fd2dca0bb?ds=inline;hp=-c

Merge branch 'jc/merge-base' (early part)

This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
---

4a164d48df6bb1b4a771741c63d4437fd2dca0bb
diff --combined Makefile
index e38cb9f61c,eb88860bc9..d66126d7ec
--- a/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  # The default target of this Makefile is...
 -all:
 +all::
  
  # Define NO_OPENSSL environment variable if you do not have OpenSSL.
  # This also implies MOZILLA_SHA1.
@@@ -172,7 -172,7 +172,7 @@@ SCRIPT_SH = 
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-pull.sh git-rebase.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
 -	git-resolve.sh git-revert.sh git-sh-setup.sh \
 +	git-revert.sh git-sh-setup.sh \
  	git-tag.sh git-verify-tag.sh \
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -192,10 -192,8 +192,10 @@@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH
  
  # ... and all the rest that could be moved out of bindir to gitexecdir
  PROGRAMS = \
 -	git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
 +	git-convert-objects$X git-fetch-pack$X git-fsck$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
 +	git-fast-import$X \
 +	git-merge-base$X \
  	git-daemon$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
  	git-peek-remote$X git-receive-pack$X \
@@@ -205,7 -203,7 +205,7 @@@
  	git-update-server-info$X \
  	git-upload-pack$X git-verify-pack$X \
  	git-pack-redundant$X git-var$X \
 -	git-describe$X git-merge-tree$X git-imap-send$X \
 +	git-merge-tree$X git-imap-send$X \
  	git-merge-recursive$X \
  	$(EXTRA_PROGRAMS)
  
@@@ -214,12 -212,12 +214,12 @@@ EXTRA_PROGRAMS 
  
  BUILT_INS = \
  	git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
 -	git-get-tar-commit-id$X git-init$X \
 +	git-get-tar-commit-id$X git-init$X git-repo-config$X \
 +	git-fsck-objects$X \
  	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
 -ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
 -	git-merge-recur$X
 +ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
  
  # Backward compatibility -- to be removed after 1.0
  PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@@ -242,7 -240,7 +242,7 @@@ LIB_H = 
  	diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
  	tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
 -	utf8.h
 +	utf8.h reflog-walk.h
  
  DIFF_OBJS = \
  	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -255,7 -253,7 +255,7 @@@ LIB_OBJS = 
  	interpolate.o \
  	lockfile.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \
 -	reachable.o \
 +	reachable.o reflog-walk.o \
  	quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
  	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
  	tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
@@@ -276,14 -274,13 +276,14 @@@ BUILTIN_OBJS = 
  	builtin-check-ref-format.o \
  	builtin-commit-tree.o \
  	builtin-count-objects.o \
 +	builtin-describe.o \
  	builtin-diff.o \
  	builtin-diff-files.o \
  	builtin-diff-index.o \
 -	builtin-diff-stages.o \
  	builtin-diff-tree.o \
  	builtin-fmt-merge-msg.o \
  	builtin-for-each-ref.o \
 +	builtin-fsck.o \
  	builtin-grep.o \
  	builtin-init-db.o \
  	builtin-log.o \
@@@ -291,6 -288,7 +291,7 @@@
  	builtin-ls-tree.o \
  	builtin-mailinfo.o \
  	builtin-mailsplit.o \
+ 	builtin-merge-base.o \
  	builtin-merge-file.o \
  	builtin-mv.o \
  	builtin-name-rev.o \
@@@ -300,7 -298,7 +301,7 @@@
  	builtin-push.o \
  	builtin-read-tree.o \
  	builtin-reflog.o \
 -	builtin-repo-config.o \
 +	builtin-config.o \
  	builtin-rerere.o \
  	builtin-rev-list.o \
  	builtin-rev-parse.o \
@@@ -503,7 -501,7 +504,7 @@@ ifdef NO_D_INO_IN_DIREN
  	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
  ifdef NO_C99_FORMAT
 -	ALL_CFLAGS += -DNO_C99_FORMAT
 +	BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
  ifdef NO_SYMLINK_HEAD
  	BASIC_CFLAGS += -DNO_SYMLINK_HEAD
@@@ -601,18 -599,14 +602,18 @@@ LIB_OBJS += $(COMPAT_OBJS
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)
  
 -export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 +export prefix gitexecdir TAR INSTALL DESTDIR SHELL_PATH template_dir
  
  
  ### Build rules
  
 -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
 +all:: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
 +ifneq (,$X)
 +	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$p';)
 +endif
  
 -all:
 +all::
 +	$(MAKE) -C git-gui all
  	$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
  	$(MAKE) -C templates
  
@@@ -626,6 -620,9 +627,6 @@@ git$X: git.c common-cmds.h $(BUILTIN_OB
  
  help.o: common-cmds.h
  
 -git-merge-recur$X: git-merge-recursive$X
 -	rm -f $@ && ln git-merge-recursive$X $@
 -
  $(BUILT_INS): git$X
  	rm -f $@ && ln git$X $@
  
@@@ -843,7 -840,6 +844,7 @@@ install: al
  	$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' install
 +	$(MAKE) -C git-gui install
  	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
  	then \
  		ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
@@@ -852,9 -848,6 +853,9 @@@
  			'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
  	fi
  	$(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
 +ifneq (,$X)
 +	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
 +endif
  
  install-doc:
  	$(MAKE) -C Documentation install
@@@ -877,11 -870,8 +878,11 @@@ dist: git.spec git-archiv
  	@mkdir -p $(GIT_TARNAME)
  	@cp git.spec $(GIT_TARNAME)
  	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
 +	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
  	$(TAR) rf $(GIT_TARNAME).tar \
 -		$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
 +		$(GIT_TARNAME)/git.spec \
 +		$(GIT_TARNAME)/version \
 +		$(GIT_TARNAME)/git-gui/version
  	@rm -rf $(GIT_TARNAME)
  	gzip -f -9 $(GIT_TARNAME).tar
  
@@@ -922,7 -912,6 +923,7 @@@ clean
  	rm -f gitweb/gitweb.cgi
  	$(MAKE) -C Documentation/ clean
  	$(MAKE) -C perl clean
 +	$(MAKE) -C git-gui clean
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
  	rm -f GIT-VERSION-FILE GIT-CFLAGS
@@@ -937,7 -926,7 +938,7 @@@ check-docs:
  	do \
  		case "$$v" in \
  		git-merge-octopus | git-merge-ours | git-merge-recursive | \
 -		git-merge-resolve | git-merge-stupid | git-merge-recur | \
 +		git-merge-resolve | git-merge-stupid | \
  		git-ssh-pull | git-ssh-push ) continue ;; \
  		esac ; \
  		test -f "Documentation/$$v.txt" || \
diff --combined builtin-branch.c
index 2d8d61b453,020ed6be7b..d0e7209368
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@@ -134,7 -134,7 +134,7 @@@ static int delete_branches(int argc, co
  		 */
  
  		if (!force &&
- 		    !in_merge_bases(rev, head_rev)) {
+ 		    !in_merge_bases(rev, &head_rev, 1)) {
  			error("The branch '%s' is not a strict subset of "
  				"your current HEAD.\n"
  				"If you are sure you want to delete it, "
@@@ -275,7 -275,7 +275,7 @@@ static void print_ref_item(struct ref_i
  	}
  }
  
 -static void print_ref_list(int kinds, int verbose, int abbrev)
 +static void print_ref_list(int kinds, int detached, int verbose, int abbrev)
  {
  	int i;
  	struct ref_list ref_list;
@@@ -286,20 -286,8 +286,20 @@@
  
  	qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
  
 +	detached = (detached && (kinds & REF_LOCAL_BRANCH));
 +	if (detached) {
 +		struct ref_item item;
 +		item.name = "(no branch)";
 +		item.kind = REF_LOCAL_BRANCH;
 +		hashcpy(item.sha1, head_sha1);
 +		if (strlen(item.name) > ref_list.maxwidth)
 +			      ref_list.maxwidth = strlen(item.name);
 +		print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
 +	}
 +
  	for (i = 0; i < ref_list.index; i++) {
 -		int current = (ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
 +		int current = !detached &&
 +			(ref_list.list[i].kind == REF_LOCAL_BRANCH) &&
  			!strcmp(ref_list.list[i].name, head);
  		print_ref_item(&ref_list.list[i], ref_list.maxwidth, verbose,
  			       abbrev, current);
@@@ -308,15 -296,13 +308,15 @@@
  	free_ref_list(&ref_list);
  }
  
 -static void create_branch(const char *name, const char *start,
 +static void create_branch(const char *name, const char *start_name,
 +			  unsigned char *start_sha1,
  			  int force, int reflog)
  {
  	struct ref_lock *lock;
  	struct commit *commit;
  	unsigned char sha1[20];
  	char ref[PATH_MAX], msg[PATH_MAX + 20];
 +	int forcing = 0;
  
  	snprintf(ref, sizeof ref, "refs/heads/%s", name);
  	if (check_ref_format(ref))
@@@ -325,34 -311,23 +325,34 @@@
  	if (resolve_ref(ref, sha1, 1, NULL)) {
  		if (!force)
  			die("A branch named '%s' already exists.", name);
 -		else if (!strcmp(head, name))
 +		else if (!is_bare_repository() && !strcmp(head, name))
  			die("Cannot force update the current branch.");
 +		forcing = 1;
  	}
  
 -	if (get_sha1(start, sha1) ||
 -	    (commit = lookup_commit_reference(sha1)) == NULL)
 -		die("Not a valid branch point: '%s'.", start);
 +	if (start_sha1)
 +		/* detached HEAD */
 +		hashcpy(sha1, start_sha1);
 +	else if (get_sha1(start_name, sha1))
 +		die("Not a valid object name: '%s'.", start_name);
 +
 +	if ((commit = lookup_commit_reference(sha1)) == NULL)
 +		die("Not a valid branch point: '%s'.", start_name);
  	hashcpy(sha1, commit->object.sha1);
  
  	lock = lock_any_ref_for_update(ref, NULL);
  	if (!lock)
  		die("Failed to lock ref for update: %s.", strerror(errno));
  
 -	if (reflog) {
 +	if (reflog)
  		log_all_ref_updates = 1;
 -		snprintf(msg, sizeof msg, "branch: Created from %s", start);
 -	}
 +
 +	if (forcing)
 +		snprintf(msg, sizeof msg, "branch: Reset from %s",
 +			 start_name);
 +	else
 +		snprintf(msg, sizeof msg, "branch: Created from %s",
 +			 start_name);
  
  	if (write_ref_sha1(lock, sha1, msg) < 0)
  		die("Failed to write ref: %s.", strerror(errno));
@@@ -363,9 -338,6 +363,9 @@@ static void rename_branch(const char *o
  	char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
  	unsigned char sha1[20];
  
 +	if (!oldname)
 +		die("cannot rename the current branch while not on any.");
 +
  	if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
  		die("Old branchname too long");
  
@@@ -387,8 -359,7 +387,8 @@@
  	if (rename_ref(oldref, newref, logmsg))
  		die("Branch rename failed");
  
 -	if (!strcmp(oldname, head) && create_symref("HEAD", newref))
 +	/* no need to pass logmsg here as HEAD didn't really move */
 +	if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
  		die("Branch renamed to %s, but HEAD is not updated!", newname);
  }
  
@@@ -396,11 -367,12 +396,11 @@@ int cmd_branch(int argc, const char **a
  {
  	int delete = 0, force_delete = 0, force_create = 0;
  	int rename = 0, force_rename = 0;
 -	int verbose = 0, abbrev = DEFAULT_ABBREV;
 +	int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
  	int reflog = 0;
  	int kinds = REF_LOCAL_BRANCH;
  	int i;
  
 -	setup_ident();
  	git_config(git_branch_config);
  
  	for (i = 1; i < argc; i++) {
@@@ -472,27 -444,22 +472,27 @@@
  	head = xstrdup(resolve_ref("HEAD", head_sha1, 0, NULL));
  	if (!head)
  		die("Failed to resolve HEAD as a valid ref.");
 -	if (strncmp(head, "refs/heads/", 11))
 -		die("HEAD not found below refs/heads!");
 -	head += 11;
 +	if (!strcmp(head, "HEAD")) {
 +		detached = 1;
 +	}
 +	else {
 +		if (strncmp(head, "refs/heads/", 11))
 +			die("HEAD not found below refs/heads!");
 +		head += 11;
 +	}
  
  	if (delete)
  		return delete_branches(argc - i, argv + i, force_delete, kinds);
  	else if (i == argc)
 -		print_ref_list(kinds, verbose, abbrev);
 +		print_ref_list(kinds, detached, verbose, abbrev);
  	else if (rename && (i == argc - 1))
  		rename_branch(head, argv[i], force_rename);
  	else if (rename && (i == argc - 2))
  		rename_branch(argv[i], argv[i + 1], force_rename);
  	else if (i == argc - 1)
 -		create_branch(argv[i], head, force_create, reflog);
 +		create_branch(argv[i], head, head_sha1, force_create, reflog);
  	else if (i == argc - 2)
 -		create_branch(argv[i], argv[i + 1], force_create, reflog);
 +		create_branch(argv[i], argv[i+1], NULL, force_create, reflog);
  	else
  		usage(builtin_branch_usage);
  
diff --combined builtin-reflog.c
index 65b845b447,fb37984ae6..341555139e
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@@ -13,7 -13,7 +13,7 @@@
   */
  
  static const char reflog_expire_usage[] =
 -"git-reflog expire [--verbose] [--dry-run] [--fix-stale] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...";
 +"git-reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>...";
  
  static unsigned long default_reflog_expire;
  static unsigned long default_reflog_expire_unreachable;
@@@ -173,6 -173,7 +173,6 @@@ static int keep_entry(struct commit **i
  {
  	struct commit *commit;
  
 -	*it = NULL;
  	if (is_null_sha1(sha1))
  		return 1;
  	commit = lookup_commit_reference_gently(sha1, 1);
@@@ -194,46 -195,41 +194,46 @@@
  }
  
  static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 -			     char *data, void *cb_data)
 +		const char *email, unsigned long timestamp, int tz,
 +		const char *message, void *cb_data)
  {
  	struct expire_reflog_cb *cb = cb_data;
 -	unsigned long timestamp;
 -	char *cp, *ep;
  	struct commit *old, *new;
  
 -	cp = strchr(data, '>');
 -	if (!cp || *++cp != ' ')
 -		goto prune;
 -	timestamp = strtoul(cp, &ep, 10);
 -	if (*ep != ' ')
 -		goto prune;
  	if (timestamp < cb->cmd->expire_total)
  		goto prune;
  
 +	old = new = NULL;
  	if (cb->cmd->stalefix &&
  	    (!keep_entry(&old, osha1) || !keep_entry(&new, nsha1)))
  		goto prune;
  
 -	if ((timestamp < cb->cmd->expire_unreachable) &&
 -	    (!cb->ref_commit ||
 -	     (old && !in_merge_bases(old, &cb->ref_commit, 1)) ||
 -	     (new && !in_merge_bases(new, &cb->ref_commit, 1))))
 -		goto prune;
 +	if (timestamp < cb->cmd->expire_unreachable) {
 +		if (!cb->ref_commit)
 +			goto prune;
 +		if (!old && !is_null_sha1(osha1))
 +			old = lookup_commit_reference_gently(osha1, 1);
 +		if (!new && !is_null_sha1(nsha1))
 +			new = lookup_commit_reference_gently(nsha1, 1);
- 		if ((old && !in_merge_bases(old, cb->ref_commit)) ||
- 		    (new && !in_merge_bases(new, cb->ref_commit)))
++		if ((old && !in_merge_bases(old, &cb->ref_commit, 1)) ||
++		    (new && !in_merge_bases(new, &cb->ref_commit, 1)))
 +			goto prune;
 +	}
  
 -	if (cb->newlog)
 -		fprintf(cb->newlog, "%s %s %s",
 -			sha1_to_hex(osha1), sha1_to_hex(nsha1), data);
 +	if (cb->newlog) {
 +		char sign = (tz < 0) ? '-' : '+';
 +		int zone = (tz < 0) ? (-tz) : tz;
 +		fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
 +			sha1_to_hex(osha1), sha1_to_hex(nsha1),
 +			email, timestamp, sign, zone,
 +			message);
 +	}
  	if (cb->cmd->verbose)
 -		printf("keep %s", data);
 +		printf("keep %s", message);
  	return 0;
   prune:
  	if (!cb->newlog || cb->cmd->verbose)
 -		printf("%sprune %s", cb->newlog ? "" : "would ", data);
 +		printf("%sprune %s", cb->newlog ? "" : "would ", message);
  	return 0;
  }
  
@@@ -242,18 -238,20 +242,18 @@@ static int expire_reflog(const char *re
  	struct cmd_reflog_expire_cb *cmd = cb_data;
  	struct expire_reflog_cb cb;
  	struct ref_lock *lock;
 -	char *newlog_path = NULL;
 +	char *log_file, *newlog_path = NULL;
  	int status = 0;
  
 -	if (strncmp(ref, "refs/", 5))
 -		return error("not a ref '%s'", ref);
 -
  	memset(&cb, 0, sizeof(cb));
  	/* we take the lock for the ref itself to prevent it from
  	 * getting updated.
  	 */
 -	lock = lock_ref_sha1(ref + 5, sha1);
 +	lock = lock_any_ref_for_update(ref, sha1);
  	if (!lock)
  		return error("cannot lock ref '%s'", ref);
 -	if (!file_exists(lock->log_file))
 +	log_file = xstrdup(git_path("logs/%s", ref));
 +	if (!file_exists(log_file))
  		goto finish;
  	if (!cmd->dry_run) {
  		newlog_path = xstrdup(git_path("logs/%s.lock", ref));
@@@ -261,6 -259,9 +261,6 @@@
  	}
  
  	cb.ref_commit = lookup_commit_reference_gently(sha1, 1);
 -	if (!cb.ref_commit)
 -		fprintf(stderr,
 -			"warning: ref '%s' does not point at a commit\n", ref);
  	cb.ref = ref;
  	cb.cmd = cmd;
  	for_each_reflog_ent(ref, expire_reflog_ent, &cb);
@@@ -269,14 -270,13 +269,14 @@@
  		if (fclose(cb.newlog))
  			status |= error("%s: %s", strerror(errno),
  					newlog_path);
 -		if (rename(newlog_path, lock->log_file)) {
 +		if (rename(newlog_path, log_file)) {
  			status |= error("cannot rename %s to %s",
 -					newlog_path, lock->log_file);
 +					newlog_path, log_file);
  			unlink(newlog_path);
  		}
  	}
  	free(newlog_path);
 +	free(log_file);
  	unlock_ref(lock);
  	return status;
  }
@@@ -350,7 -350,7 +350,7 @@@ static int cmd_reflog_expire(int argc, 
  	}
  
  	if (do_all)
 -		status |= for_each_ref(expire_reflog, &cb);
 +		status |= for_each_reflog(expire_reflog, &cb);
  	while (i < argc) {
  		const char *ref = argv[i++];
  		unsigned char sha1[20];
@@@ -372,16 -372,10 +372,16 @@@ static const char reflog_usage[] 
  
  int cmd_reflog(int argc, const char **argv, const char *prefix)
  {
 -	if (argc < 2)
 -		usage(reflog_usage);
 -	else if (!strcmp(argv[1], "expire"))
 +	/* With no command, we default to showing it. */
 +	if (argc < 2 || *argv[1] == '-')
 +		return cmd_log_reflog(argc, argv, prefix);
 +
 +	if (!strcmp(argv[1], "show"))
 +		return cmd_log_reflog(argc - 1, argv + 1, prefix);
 +
 +	if (!strcmp(argv[1], "expire"))
  		return cmd_reflog_expire(argc - 1, argv + 1, prefix);
 -	else
 -		usage(reflog_usage);
 +
 +	/* Not a recognized reflog command..*/
 +	usage(reflog_usage);
  }
diff --combined builtin.h
index 7160148239,ae32993ce9..57e8741ff0
--- a/builtin.h
+++ b/builtin.h
@@@ -25,25 -25,24 +25,26 @@@ extern int cmd_check_ref_format(int arg
  extern int cmd_cherry(int argc, const char **argv, const char *prefix);
  extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
 +extern int cmd_describe(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
  extern int cmd_diff(int argc, const char **argv, const char *prefix);
 -extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
  extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
 +extern int cmd_fsck(int argc, const char **argv, const char *prefix);
  extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
  extern int cmd_grep(int argc, const char **argv, const char *prefix);
  extern int cmd_help(int argc, const char **argv, const char *prefix);
  extern int cmd_init_db(int argc, const char **argv, const char *prefix);
  extern int cmd_log(int argc, const char **argv, const char *prefix);
 +extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
  extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
  extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
  extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
+ extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
  extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
  extern int cmd_mv(int argc, const char **argv, const char *prefix);
  extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
@@@ -54,7 -53,7 +55,7 @@@ extern int cmd_prune_packed(int argc, c
  extern int cmd_push(int argc, const char **argv, const char *prefix);
  extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_reflog(int argc, const char **argv, const char *prefix);
 -extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
 +extern int cmd_config(int argc, const char **argv, const char *prefix);
  extern int cmd_rerere(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
  extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
diff --combined commit.c
index 3e8c87294b,aa14c5adb0..8d279b0b63
--- a/commit.c
+++ b/commit.c
@@@ -47,8 -47,7 +47,8 @@@ enum cmit_fmt get_commit_format(const c
  	if (*arg == '=')
  		arg++;
  	for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
 -		if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))
 +		if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
 +		    !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
  			return cmt_fmts[i].v;
  	}
  
@@@ -465,29 -464,20 +465,29 @@@ static int get_one_line(const char *msg
  	return ret;
  }
  
 +/* High bit set, or ISO-2022-INT */
 +static int non_ascii(int ch)
 +{
 +	ch = (ch & 0xff);
 +	return ((ch & 0x80) || (ch == 0x1b));
 +}
 +
  static int is_rfc2047_special(char ch)
  {
 -	return ((ch & 0x80) || (ch == '=') || (ch == '?') || (ch == '_'));
 +	return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
  }
  
 -static int add_rfc2047(char *buf, const char *line, int len)
 +static int add_rfc2047(char *buf, const char *line, int len,
 +		       const char *encoding)
  {
  	char *bp = buf;
  	int i, needquote;
 -	static const char q_utf8[] = "=?utf-8?q?";
 +	char q_encoding[128];
 +	const char *q_encoding_fmt = "=?%s?q?";
  
  	for (i = needquote = 0; !needquote && i < len; i++) {
 -		unsigned ch = line[i];
 -		if (ch & 0x80)
 +		int ch = line[i];
 +		if (non_ascii(ch))
  			needquote++;
  		if ((i + 1 < len) &&
  		    (ch == '=' && line[i+1] == '?'))
@@@ -496,11 -486,8 +496,11 @@@
  	if (!needquote)
  		return sprintf(buf, "%.*s", len, line);
  
 -	memcpy(bp, q_utf8, sizeof(q_utf8)-1);
 -	bp += sizeof(q_utf8)-1;
 +	i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
 +	if (sizeof(q_encoding) < i)
 +		die("Insanely long encoding name %s", encoding);
 +	memcpy(bp, q_encoding, i);
 +	bp += i;
  	for (i = 0; i < len; i++) {
  		unsigned ch = line[i] & 0xFF;
  		if (is_rfc2047_special(ch)) {
@@@ -518,8 -505,7 +518,8 @@@
  }
  
  static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
 -			 const char *line, int relative_date)
 +			 const char *line, int relative_date,
 +			 const char *encoding)
  {
  	char *date;
  	int namelen;
@@@ -547,8 -533,7 +547,8 @@@
  		filler = "";
  		strcpy(buf, "From: ");
  		ret = strlen(buf);
 -		ret += add_rfc2047(buf + ret, line, display_name_length);
 +		ret += add_rfc2047(buf + ret, line, display_name_length,
 +				   encoding);
  		memcpy(buf + ret, name_tail, namelen - display_name_length);
  		ret += namelen - display_name_length;
  		buf[ret++] = '\n';
@@@ -683,18 -668,21 +683,18 @@@ static char *replace_encoding_header(ch
  	return buf;
  }
  
 -static char *logmsg_reencode(const struct commit *commit)
 +static char *logmsg_reencode(const struct commit *commit,
 +			     char *output_encoding)
  {
  	char *encoding;
  	char *out;
 -	char *output_encoding = (git_log_output_encoding
 -				 ? git_log_output_encoding
 -				 : git_commit_encoding);
 +	char *utf8 = "utf-8";
  
 -	if (!output_encoding)
 -		output_encoding = "utf-8";
 -	else if (!*output_encoding)
 +	if (!*output_encoding)
  		return NULL;
  	encoding = get_header(commit, "encoding");
  	if (!encoding)
 -		return NULL;
 +		encoding = utf8;
  	if (!strcmp(encoding, output_encoding))
  		out = strdup(commit->buffer);
  	else
@@@ -703,8 -691,7 +703,8 @@@
  	if (out)
  		out = replace_encoding_header(out, output_encoding);
  
 -	free(encoding);
 +	if (encoding != utf8)
 +		free(encoding);
  	if (!out)
  		return NULL;
  	return out;
@@@ -724,15 -711,8 +724,15 @@@ unsigned long pretty_print_commit(enum 
  	int parents_shown = 0;
  	const char *msg = commit->buffer;
  	int plain_non_ascii = 0;
 -	char *reencoded = logmsg_reencode(commit);
 +	char *reencoded;
 +	char *encoding;
  
 +	encoding = (git_log_output_encoding
 +		    ? git_log_output_encoding
 +		    : git_commit_encoding);
 +	if (!encoding)
 +		encoding = "utf-8";
 +	reencoded = logmsg_reencode(commit, encoding);
  	if (reencoded)
  		msg = reencoded;
  
@@@ -758,7 -738,7 +758,7 @@@
  				    i + 1 < len && msg[i+1] == '\n')
  					in_body = 1;
  			}
 -			else if (ch & 0x80) {
 +			else if (non_ascii(ch)) {
  				plain_non_ascii = 1;
  				break;
  			}
@@@ -817,15 -797,13 +817,15 @@@
  				offset += add_user_info("Author", fmt,
  							buf + offset,
  							line + 7,
 -							relative_date);
 +							relative_date,
 +							encoding);
  			if (!memcmp(line, "committer ", 10) &&
  			    (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
  				offset += add_user_info("Commit", fmt,
  							buf + offset,
  							line + 10,
 -							relative_date);
 +							relative_date,
 +							encoding);
  			continue;
  		}
  
@@@ -848,8 -826,7 +848,8 @@@
  			int slen = strlen(subject);
  			memcpy(buf + offset, subject, slen);
  			offset += slen;
 -			offset += add_rfc2047(buf + offset, line, linelen);
 +			offset += add_rfc2047(buf + offset, line, linelen,
 +					      encoding);
  		}
  		else {
  			memset(buf + offset, ' ', indent);
@@@ -860,17 -837,11 +860,17 @@@
  		if (fmt == CMIT_FMT_ONELINE)
  			break;
  		if (subject && plain_non_ascii) {
 -			static const char header[] =
 -				"Content-Type: text/plain; charset=UTF-8\n"
 +			int sz;
 +			char header[512];
 +			const char *header_fmt =
 +				"Content-Type: text/plain; charset=%s\n"
  				"Content-Transfer-Encoding: 8bit\n";
 -			memcpy(buf + offset, header, sizeof(header)-1);
 -			offset += sizeof(header)-1;
 +			sz = snprintf(header, sizeof(header), header_fmt,
 +				      encoding);
 +			if (sizeof(header) < sz)
 +				die("Encoding name %s too long", encoding);
 +			memcpy(buf + offset, header, sz);
 +			offset += sz;
  		}
  		if (after_subject) {
  			int slen = strlen(after_subject);
@@@ -1187,14 -1158,17 +1187,17 @@@ struct commit_list *get_merge_bases(str
  	return result;
  }
  
- int in_merge_bases(struct commit *rev1, struct commit *rev2)
+ int in_merge_bases(struct commit *commit, struct commit **reference, int num)
  {
  	struct commit_list *bases, *b;
  	int ret = 0;
  
- 	bases = get_merge_bases(rev1, rev2, 1);
+ 	if (num == 1)
+ 		bases = get_merge_bases(commit, *reference, 1);
+ 	else
+ 		die("not yet");
  	for (b = bases; b; b = b->next) {
- 		if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
+ 		if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
  			ret = 1;
  			break;
  		}
diff --combined commit.h
index 491b0c4aac,b8e6e18a80..c73744463c
--- a/commit.h
+++ b/commit.h
@@@ -110,9 -110,9 +110,9 @@@ extern struct commit_list *get_merge_ba
  extern int register_shallow(const unsigned char *sha1);
  extern int unregister_shallow(const unsigned char *sha1);
  extern int write_shallow_commits(int fd, int use_pack_protocol);
 -extern int is_repository_shallow();
 +extern int is_repository_shallow(void);
  extern struct commit_list *get_shallow_commits(struct object_array *heads,
  		int depth, int shallow_flag, int not_shallow_flag);
  
- int in_merge_bases(struct commit *rev1, struct commit *rev2);
+ int in_merge_bases(struct commit *, struct commit **, int);
  #endif /* COMMIT_H */
diff --combined fast-import.c
index fd3b117574,0000000000..404d911390
mode 100644,000000..100644
--- a/fast-import.c
+++ b/fast-import.c
@@@ -1,2081 -1,0 +1,2081 @@@
 +/*
 +Format of STDIN stream:
 +
 +  stream ::= cmd*;
 +
 +  cmd ::= new_blob
 +        | new_commit
 +        | new_tag
 +        | reset_branch
 +        | checkpoint
 +        ;
 +
 +  new_blob ::= 'blob' lf
 +	mark?
 +    file_content;
 +  file_content ::= data;
 +
 +  new_commit ::= 'commit' sp ref_str lf
 +    mark?
 +    ('author' sp name '<' email '>' when lf)?
 +    'committer' sp name '<' email '>' when lf
 +    commit_msg
 +    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
 +    ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
 +    file_change*
 +    lf;
 +  commit_msg ::= data;
 +
 +  file_change ::= file_clr | file_del | file_obm | file_inm;
 +  file_clr ::= 'deleteall' lf;
 +  file_del ::= 'D' sp path_str lf;
 +  file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
 +  file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
 +    data;
 +
 +  new_tag ::= 'tag' sp tag_str lf
 +    'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
 +	'tagger' sp name '<' email '>' when lf
 +    tag_msg;
 +  tag_msg ::= data;
 +
 +  reset_branch ::= 'reset' sp ref_str lf
 +    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
 +    lf;
 +
 +  checkpoint ::= 'checkpoint' lf
 +    lf;
 +
 +     # note: the first idnum in a stream should be 1 and subsequent
 +     # idnums should not have gaps between values as this will cause
 +     # the stream parser to reserve space for the gapped values.  An
 +	 # idnum can be updated in the future to a new object by issuing
 +     # a new mark directive with the old idnum.
 +	 #
 +  mark ::= 'mark' sp idnum lf;
 +  data ::= (delimited_data | exact_data)
 +    lf;
 +
 +    # note: delim may be any string but must not contain lf.
 +    # data_line may contain any data but must not be exactly
 +    # delim.
 +  delimited_data ::= 'data' sp '<<' delim lf
 +    (data_line lf)*
 +	delim lf;
 +
 +     # note: declen indicates the length of binary_data in bytes.
 +     # declen does not include the lf preceeding the binary data.
 +     #
 +  exact_data ::= 'data' sp declen lf
 +    binary_data;
 +
 +     # note: quoted strings are C-style quoting supporting \c for
 +     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
 +	 # is the signed byte value in octal.  Note that the only
 +     # characters which must actually be escaped to protect the
 +     # stream formatting is: \, " and LF.  Otherwise these values
 +	 # are UTF8.
 +     #
 +  ref_str     ::= ref;
 +  sha1exp_str ::= sha1exp;
 +  tag_str     ::= tag;
 +  path_str    ::= path    | '"' quoted(path)    '"' ;
 +  mode        ::= '100644' | '644'
 +                | '100755' | '755'
 +                | '120000'
 +                ;
 +
 +  declen ::= # unsigned 32 bit value, ascii base10 notation;
 +  bigint ::= # unsigned integer value, ascii base10 notation;
 +  binary_data ::= # file content, not interpreted;
 +
 +  when         ::= raw_when | rfc2822_when;
 +  raw_when     ::= ts sp tz;
 +  rfc2822_when ::= # Valid RFC 2822 date and time;
 +
 +  sp ::= # ASCII space character;
 +  lf ::= # ASCII newline (LF) character;
 +
 +     # note: a colon (':') must precede the numerical value assigned to
 +	 # an idnum.  This is to distinguish it from a ref or tag name as
 +     # GIT does not permit ':' in ref or tag strings.
 +	 #
 +  idnum   ::= ':' bigint;
 +  path    ::= # GIT style file path, e.g. "a/b/c";
 +  ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
 +  tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
 +  sha1exp ::= # Any valid GIT SHA1 expression;
 +  hexsha1 ::= # SHA1 in hexadecimal format;
 +
 +     # note: name and email are UTF8 strings, however name must not
 +	 # contain '<' or lf and email must not contain any of the
 +     # following: '<', '>', lf.
 +	 #
 +  name  ::= # valid GIT author/committer name;
 +  email ::= # valid GIT author/committer email;
 +  ts    ::= # time since the epoch in seconds, ascii base10 notation;
 +  tz    ::= # GIT style timezone;
 +*/
 +
 +#include "builtin.h"
 +#include "cache.h"
 +#include "object.h"
 +#include "blob.h"
 +#include "tree.h"
 +#include "commit.h"
 +#include "delta.h"
 +#include "pack.h"
 +#include "refs.h"
 +#include "csum-file.h"
 +#include "strbuf.h"
 +#include "quote.h"
 +
 +#define PACK_ID_BITS 16
 +#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
 +
 +struct object_entry
 +{
 +	struct object_entry *next;
 +	uint32_t offset;
 +	unsigned type : TYPE_BITS;
 +	unsigned pack_id : PACK_ID_BITS;
 +	unsigned char sha1[20];
 +};
 +
 +struct object_entry_pool
 +{
 +	struct object_entry_pool *next_pool;
 +	struct object_entry *next_free;
 +	struct object_entry *end;
 +	struct object_entry entries[FLEX_ARRAY]; /* more */
 +};
 +
 +struct mark_set
 +{
 +	union {
 +		struct object_entry *marked[1024];
 +		struct mark_set *sets[1024];
 +	} data;
 +	unsigned int shift;
 +};
 +
 +struct last_object
 +{
 +	void *data;
 +	unsigned long len;
 +	uint32_t offset;
 +	unsigned int depth;
 +	unsigned no_free:1;
 +};
 +
 +struct mem_pool
 +{
 +	struct mem_pool *next_pool;
 +	char *next_free;
 +	char *end;
 +	char space[FLEX_ARRAY]; /* more */
 +};
 +
 +struct atom_str
 +{
 +	struct atom_str *next_atom;
 +	unsigned short str_len;
 +	char str_dat[FLEX_ARRAY]; /* more */
 +};
 +
 +struct tree_content;
 +struct tree_entry
 +{
 +	struct tree_content *tree;
 +	struct atom_str* name;
 +	struct tree_entry_ms
 +	{
 +		uint16_t mode;
 +		unsigned char sha1[20];
 +	} versions[2];
 +};
 +
 +struct tree_content
 +{
 +	unsigned int entry_capacity; /* must match avail_tree_content */
 +	unsigned int entry_count;
 +	unsigned int delta_depth;
 +	struct tree_entry *entries[FLEX_ARRAY]; /* more */
 +};
 +
 +struct avail_tree_content
 +{
 +	unsigned int entry_capacity; /* must match tree_content */
 +	struct avail_tree_content *next_avail;
 +};
 +
 +struct branch
 +{
 +	struct branch *table_next_branch;
 +	struct branch *active_next_branch;
 +	const char *name;
 +	struct tree_entry branch_tree;
 +	uintmax_t last_commit;
 +	unsigned int pack_id;
 +	unsigned char sha1[20];
 +};
 +
 +struct tag
 +{
 +	struct tag *next_tag;
 +	const char *name;
 +	unsigned int pack_id;
 +	unsigned char sha1[20];
 +};
 +
 +struct dbuf
 +{
 +	void *buffer;
 +	size_t capacity;
 +};
 +
 +struct hash_list
 +{
 +	struct hash_list *next;
 +	unsigned char sha1[20];
 +};
 +
 +typedef enum {
 +	WHENSPEC_RAW = 1,
 +	WHENSPEC_RFC2822,
 +	WHENSPEC_NOW,
 +} whenspec_type;
 +
 +/* Configured limits on output */
 +static unsigned long max_depth = 10;
 +static unsigned long max_packsize = (1LL << 32) - 1;
 +static int force_update;
 +
 +/* Stats and misc. counters */
 +static uintmax_t alloc_count;
 +static uintmax_t marks_set_count;
 +static uintmax_t object_count_by_type[1 << TYPE_BITS];
 +static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
 +static uintmax_t delta_count_by_type[1 << TYPE_BITS];
 +static unsigned long object_count;
 +static unsigned long branch_count;
 +static unsigned long branch_load_count;
 +static int failure;
 +static FILE *pack_edges;
 +
 +/* Memory pools */
 +static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
 +static size_t total_allocd;
 +static struct mem_pool *mem_pool;
 +
 +/* Atom management */
 +static unsigned int atom_table_sz = 4451;
 +static unsigned int atom_cnt;
 +static struct atom_str **atom_table;
 +
 +/* The .pack file being generated */
 +static unsigned int pack_id;
 +static struct packed_git *pack_data;
 +static struct packed_git **all_packs;
 +static unsigned long pack_size;
 +
 +/* Table of objects we've written. */
 +static unsigned int object_entry_alloc = 5000;
 +static struct object_entry_pool *blocks;
 +static struct object_entry *object_table[1 << 16];
 +static struct mark_set *marks;
 +static const char* mark_file;
 +
 +/* Our last blob */
 +static struct last_object last_blob;
 +
 +/* Tree management */
 +static unsigned int tree_entry_alloc = 1000;
 +static void *avail_tree_entry;
 +static unsigned int avail_tree_table_sz = 100;
 +static struct avail_tree_content **avail_tree_table;
 +static struct dbuf old_tree;
 +static struct dbuf new_tree;
 +
 +/* Branch data */
 +static unsigned long max_active_branches = 5;
 +static unsigned long cur_active_branches;
 +static unsigned long branch_table_sz = 1039;
 +static struct branch **branch_table;
 +static struct branch *active_branches;
 +
 +/* Tag data */
 +static struct tag *first_tag;
 +static struct tag *last_tag;
 +
 +/* Input stream parsing */
 +static whenspec_type whenspec = WHENSPEC_RAW;
 +static struct strbuf command_buf;
 +static uintmax_t next_mark;
 +static struct dbuf new_data;
 +
 +
 +static void alloc_objects(unsigned int cnt)
 +{
 +	struct object_entry_pool *b;
 +
 +	b = xmalloc(sizeof(struct object_entry_pool)
 +		+ cnt * sizeof(struct object_entry));
 +	b->next_pool = blocks;
 +	b->next_free = b->entries;
 +	b->end = b->entries + cnt;
 +	blocks = b;
 +	alloc_count += cnt;
 +}
 +
 +static struct object_entry *new_object(unsigned char *sha1)
 +{
 +	struct object_entry *e;
 +
 +	if (blocks->next_free == blocks->end)
 +		alloc_objects(object_entry_alloc);
 +
 +	e = blocks->next_free++;
 +	hashcpy(e->sha1, sha1);
 +	return e;
 +}
 +
 +static struct object_entry *find_object(unsigned char *sha1)
 +{
 +	unsigned int h = sha1[0] << 8 | sha1[1];
 +	struct object_entry *e;
 +	for (e = object_table[h]; e; e = e->next)
 +		if (!hashcmp(sha1, e->sha1))
 +			return e;
 +	return NULL;
 +}
 +
 +static struct object_entry *insert_object(unsigned char *sha1)
 +{
 +	unsigned int h = sha1[0] << 8 | sha1[1];
 +	struct object_entry *e = object_table[h];
 +	struct object_entry *p = NULL;
 +
 +	while (e) {
 +		if (!hashcmp(sha1, e->sha1))
 +			return e;
 +		p = e;
 +		e = e->next;
 +	}
 +
 +	e = new_object(sha1);
 +	e->next = NULL;
 +	e->offset = 0;
 +	if (p)
 +		p->next = e;
 +	else
 +		object_table[h] = e;
 +	return e;
 +}
 +
 +static unsigned int hc_str(const char *s, size_t len)
 +{
 +	unsigned int r = 0;
 +	while (len-- > 0)
 +		r = r * 31 + *s++;
 +	return r;
 +}
 +
 +static void *pool_alloc(size_t len)
 +{
 +	struct mem_pool *p;
 +	void *r;
 +
 +	for (p = mem_pool; p; p = p->next_pool)
 +		if ((p->end - p->next_free >= len))
 +			break;
 +
 +	if (!p) {
 +		if (len >= (mem_pool_alloc/2)) {
 +			total_allocd += len;
 +			return xmalloc(len);
 +		}
 +		total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
 +		p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
 +		p->next_pool = mem_pool;
 +		p->next_free = p->space;
 +		p->end = p->next_free + mem_pool_alloc;
 +		mem_pool = p;
 +	}
 +
 +	r = p->next_free;
 +	/* round out to a pointer alignment */
 +	if (len & (sizeof(void*) - 1))
 +		len += sizeof(void*) - (len & (sizeof(void*) - 1));
 +	p->next_free += len;
 +	return r;
 +}
 +
 +static void *pool_calloc(size_t count, size_t size)
 +{
 +	size_t len = count * size;
 +	void *r = pool_alloc(len);
 +	memset(r, 0, len);
 +	return r;
 +}
 +
 +static char *pool_strdup(const char *s)
 +{
 +	char *r = pool_alloc(strlen(s) + 1);
 +	strcpy(r, s);
 +	return r;
 +}
 +
 +static void size_dbuf(struct dbuf *b, size_t maxlen)
 +{
 +	if (b->buffer) {
 +		if (b->capacity >= maxlen)
 +			return;
 +		free(b->buffer);
 +	}
 +	b->capacity = ((maxlen / 1024) + 1) * 1024;
 +	b->buffer = xmalloc(b->capacity);
 +}
 +
 +static void insert_mark(uintmax_t idnum, struct object_entry *oe)
 +{
 +	struct mark_set *s = marks;
 +	while ((idnum >> s->shift) >= 1024) {
 +		s = pool_calloc(1, sizeof(struct mark_set));
 +		s->shift = marks->shift + 10;
 +		s->data.sets[0] = marks;
 +		marks = s;
 +	}
 +	while (s->shift) {
 +		uintmax_t i = idnum >> s->shift;
 +		idnum -= i << s->shift;
 +		if (!s->data.sets[i]) {
 +			s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
 +			s->data.sets[i]->shift = s->shift - 10;
 +		}
 +		s = s->data.sets[i];
 +	}
 +	if (!s->data.marked[idnum])
 +		marks_set_count++;
 +	s->data.marked[idnum] = oe;
 +}
 +
 +static struct object_entry *find_mark(uintmax_t idnum)
 +{
 +	uintmax_t orig_idnum = idnum;
 +	struct mark_set *s = marks;
 +	struct object_entry *oe = NULL;
 +	if ((idnum >> s->shift) < 1024) {
 +		while (s && s->shift) {
 +			uintmax_t i = idnum >> s->shift;
 +			idnum -= i << s->shift;
 +			s = s->data.sets[i];
 +		}
 +		if (s)
 +			oe = s->data.marked[idnum];
 +	}
 +	if (!oe)
 +		die("mark :%ju not declared", orig_idnum);
 +	return oe;
 +}
 +
 +static struct atom_str *to_atom(const char *s, unsigned short len)
 +{
 +	unsigned int hc = hc_str(s, len) % atom_table_sz;
 +	struct atom_str *c;
 +
 +	for (c = atom_table[hc]; c; c = c->next_atom)
 +		if (c->str_len == len && !strncmp(s, c->str_dat, len))
 +			return c;
 +
 +	c = pool_alloc(sizeof(struct atom_str) + len + 1);
 +	c->str_len = len;
 +	strncpy(c->str_dat, s, len);
 +	c->str_dat[len] = 0;
 +	c->next_atom = atom_table[hc];
 +	atom_table[hc] = c;
 +	atom_cnt++;
 +	return c;
 +}
 +
 +static struct branch *lookup_branch(const char *name)
 +{
 +	unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 +	struct branch *b;
 +
 +	for (b = branch_table[hc]; b; b = b->table_next_branch)
 +		if (!strcmp(name, b->name))
 +			return b;
 +	return NULL;
 +}
 +
 +static struct branch *new_branch(const char *name)
 +{
 +	unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 +	struct branch* b = lookup_branch(name);
 +
 +	if (b)
 +		die("Invalid attempt to create duplicate branch: %s", name);
 +	if (check_ref_format(name))
 +		die("Branch name doesn't conform to GIT standards: %s", name);
 +
 +	b = pool_calloc(1, sizeof(struct branch));
 +	b->name = pool_strdup(name);
 +	b->table_next_branch = branch_table[hc];
 +	b->branch_tree.versions[0].mode = S_IFDIR;
 +	b->branch_tree.versions[1].mode = S_IFDIR;
 +	b->pack_id = MAX_PACK_ID;
 +	branch_table[hc] = b;
 +	branch_count++;
 +	return b;
 +}
 +
 +static unsigned int hc_entries(unsigned int cnt)
 +{
 +	cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
 +	return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
 +}
 +
 +static struct tree_content *new_tree_content(unsigned int cnt)
 +{
 +	struct avail_tree_content *f, *l = NULL;
 +	struct tree_content *t;
 +	unsigned int hc = hc_entries(cnt);
 +
 +	for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
 +		if (f->entry_capacity >= cnt)
 +			break;
 +
 +	if (f) {
 +		if (l)
 +			l->next_avail = f->next_avail;
 +		else
 +			avail_tree_table[hc] = f->next_avail;
 +	} else {
 +		cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
 +		f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
 +		f->entry_capacity = cnt;
 +	}
 +
 +	t = (struct tree_content*)f;
 +	t->entry_count = 0;
 +	t->delta_depth = 0;
 +	return t;
 +}
 +
 +static void release_tree_entry(struct tree_entry *e);
 +static void release_tree_content(struct tree_content *t)
 +{
 +	struct avail_tree_content *f = (struct avail_tree_content*)t;
 +	unsigned int hc = hc_entries(f->entry_capacity);
 +	f->next_avail = avail_tree_table[hc];
 +	avail_tree_table[hc] = f;
 +}
 +
 +static void release_tree_content_recursive(struct tree_content *t)
 +{
 +	unsigned int i;
 +	for (i = 0; i < t->entry_count; i++)
 +		release_tree_entry(t->entries[i]);
 +	release_tree_content(t);
 +}
 +
 +static struct tree_content *grow_tree_content(
 +	struct tree_content *t,
 +	int amt)
 +{
 +	struct tree_content *r = new_tree_content(t->entry_count + amt);
 +	r->entry_count = t->entry_count;
 +	r->delta_depth = t->delta_depth;
 +	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
 +	release_tree_content(t);
 +	return r;
 +}
 +
 +static struct tree_entry *new_tree_entry(void)
 +{
 +	struct tree_entry *e;
 +
 +	if (!avail_tree_entry) {
 +		unsigned int n = tree_entry_alloc;
 +		total_allocd += n * sizeof(struct tree_entry);
 +		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
 +		while (n-- > 1) {
 +			*((void**)e) = e + 1;
 +			e++;
 +		}
 +		*((void**)e) = NULL;
 +	}
 +
 +	e = avail_tree_entry;
 +	avail_tree_entry = *((void**)e);
 +	return e;
 +}
 +
 +static void release_tree_entry(struct tree_entry *e)
 +{
 +	if (e->tree)
 +		release_tree_content_recursive(e->tree);
 +	*((void**)e) = avail_tree_entry;
 +	avail_tree_entry = e;
 +}
 +
 +static void start_packfile(void)
 +{
 +	static char tmpfile[PATH_MAX];
 +	struct packed_git *p;
 +	struct pack_header hdr;
 +	int pack_fd;
 +
 +	snprintf(tmpfile, sizeof(tmpfile),
 +		"%s/pack_XXXXXX", get_object_directory());
 +	pack_fd = mkstemp(tmpfile);
 +	if (pack_fd < 0)
 +		die("Can't create %s: %s", tmpfile, strerror(errno));
 +	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
 +	strcpy(p->pack_name, tmpfile);
 +	p->pack_fd = pack_fd;
 +
 +	hdr.hdr_signature = htonl(PACK_SIGNATURE);
 +	hdr.hdr_version = htonl(2);
 +	hdr.hdr_entries = 0;
 +	write_or_die(p->pack_fd, &hdr, sizeof(hdr));
 +
 +	pack_data = p;
 +	pack_size = sizeof(hdr);
 +	object_count = 0;
 +
 +	all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
 +	all_packs[pack_id] = p;
 +}
 +
 +static void fixup_header_footer(void)
 +{
 +	static const int buf_sz = 128 * 1024;
 +	int pack_fd = pack_data->pack_fd;
 +	SHA_CTX c;
 +	struct pack_header hdr;
 +	char *buf;
 +
 +	if (lseek(pack_fd, 0, SEEK_SET) != 0)
 +		die("Failed seeking to start: %s", strerror(errno));
 +	if (read_in_full(pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
 +		die("Unable to reread header of %s", pack_data->pack_name);
 +	if (lseek(pack_fd, 0, SEEK_SET) != 0)
 +		die("Failed seeking to start: %s", strerror(errno));
 +	hdr.hdr_entries = htonl(object_count);
 +	write_or_die(pack_fd, &hdr, sizeof(hdr));
 +
 +	SHA1_Init(&c);
 +	SHA1_Update(&c, &hdr, sizeof(hdr));
 +
 +	buf = xmalloc(buf_sz);
 +	for (;;) {
 +		size_t n = xread(pack_fd, buf, buf_sz);
 +		if (!n)
 +			break;
 +		if (n < 0)
 +			die("Failed to checksum %s", pack_data->pack_name);
 +		SHA1_Update(&c, buf, n);
 +	}
 +	free(buf);
 +
 +	SHA1_Final(pack_data->sha1, &c);
 +	write_or_die(pack_fd, pack_data->sha1, sizeof(pack_data->sha1));
 +	close(pack_fd);
 +}
 +
 +static int oecmp (const void *a_, const void *b_)
 +{
 +	struct object_entry *a = *((struct object_entry**)a_);
 +	struct object_entry *b = *((struct object_entry**)b_);
 +	return hashcmp(a->sha1, b->sha1);
 +}
 +
 +static char *create_index(void)
 +{
 +	static char tmpfile[PATH_MAX];
 +	SHA_CTX ctx;
 +	struct sha1file *f;
 +	struct object_entry **idx, **c, **last, *e;
 +	struct object_entry_pool *o;
 +	uint32_t array[256];
 +	int i, idx_fd;
 +
 +	/* Build the sorted table of object IDs. */
 +	idx = xmalloc(object_count * sizeof(struct object_entry*));
 +	c = idx;
 +	for (o = blocks; o; o = o->next_pool)
 +		for (e = o->next_free; e-- != o->entries;)
 +			if (pack_id == e->pack_id)
 +				*c++ = e;
 +	last = idx + object_count;
 +	if (c != last)
 +		die("internal consistency error creating the index");
 +	qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
 +
 +	/* Generate the fan-out array. */
 +	c = idx;
 +	for (i = 0; i < 256; i++) {
 +		struct object_entry **next = c;;
 +		while (next < last) {
 +			if ((*next)->sha1[0] != i)
 +				break;
 +			next++;
 +		}
 +		array[i] = htonl(next - idx);
 +		c = next;
 +	}
 +
 +	snprintf(tmpfile, sizeof(tmpfile),
 +		"%s/index_XXXXXX", get_object_directory());
 +	idx_fd = mkstemp(tmpfile);
 +	if (idx_fd < 0)
 +		die("Can't create %s: %s", tmpfile, strerror(errno));
 +	f = sha1fd(idx_fd, tmpfile);
 +	sha1write(f, array, 256 * sizeof(int));
 +	SHA1_Init(&ctx);
 +	for (c = idx; c != last; c++) {
 +		uint32_t offset = htonl((*c)->offset);
 +		sha1write(f, &offset, 4);
 +		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
 +		SHA1_Update(&ctx, (*c)->sha1, 20);
 +	}
 +	sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
 +	sha1close(f, NULL, 1);
 +	free(idx);
 +	SHA1_Final(pack_data->sha1, &ctx);
 +	return tmpfile;
 +}
 +
 +static char *keep_pack(char *curr_index_name)
 +{
 +	static char name[PATH_MAX];
 +	static char *keep_msg = "fast-import";
 +	int keep_fd;
 +
 +	chmod(pack_data->pack_name, 0444);
 +	chmod(curr_index_name, 0444);
 +
 +	snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
 +		 get_object_directory(), sha1_to_hex(pack_data->sha1));
 +	keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
 +	if (keep_fd < 0)
 +		die("cannot create keep file");
 +	write(keep_fd, keep_msg, strlen(keep_msg));
 +	close(keep_fd);
 +
 +	snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
 +		 get_object_directory(), sha1_to_hex(pack_data->sha1));
 +	if (move_temp_to_file(pack_data->pack_name, name))
 +		die("cannot store pack file");
 +
 +	snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
 +		 get_object_directory(), sha1_to_hex(pack_data->sha1));
 +	if (move_temp_to_file(curr_index_name, name))
 +		die("cannot store index file");
 +	return name;
 +}
 +
 +static void unkeep_all_packs(void)
 +{
 +	static char name[PATH_MAX];
 +	int k;
 +
 +	for (k = 0; k < pack_id; k++) {
 +		struct packed_git *p = all_packs[k];
 +		snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
 +			 get_object_directory(), sha1_to_hex(p->sha1));
 +		unlink(name);
 +	}
 +}
 +
 +static void end_packfile(void)
 +{
 +	struct packed_git *old_p = pack_data, *new_p;
 +
 +	if (object_count) {
 +		char *idx_name;
 +		int i;
 +		struct branch *b;
 +		struct tag *t;
 +
 +		fixup_header_footer();
 +		idx_name = keep_pack(create_index());
 +
 +		/* Register the packfile with core git's machinary. */
 +		new_p = add_packed_git(idx_name, strlen(idx_name), 1);
 +		if (!new_p)
 +			die("core git rejected index %s", idx_name);
 +		new_p->windows = old_p->windows;
 +		all_packs[pack_id] = new_p;
 +		install_packed_git(new_p);
 +
 +		/* Print the boundary */
 +		if (pack_edges) {
 +			fprintf(pack_edges, "%s:", new_p->pack_name);
 +			for (i = 0; i < branch_table_sz; i++) {
 +				for (b = branch_table[i]; b; b = b->table_next_branch) {
 +					if (b->pack_id == pack_id)
 +						fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
 +				}
 +			}
 +			for (t = first_tag; t; t = t->next_tag) {
 +				if (t->pack_id == pack_id)
 +					fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
 +			}
 +			fputc('\n', pack_edges);
 +			fflush(pack_edges);
 +		}
 +
 +		pack_id++;
 +	}
 +	else
 +		unlink(old_p->pack_name);
 +	free(old_p);
 +
 +	/* We can't carry a delta across packfiles. */
 +	free(last_blob.data);
 +	last_blob.data = NULL;
 +	last_blob.len = 0;
 +	last_blob.offset = 0;
 +	last_blob.depth = 0;
 +}
 +
 +static void cycle_packfile(void)
 +{
 +	end_packfile();
 +	start_packfile();
 +}
 +
 +static size_t encode_header(
 +	enum object_type type,
 +	size_t size,
 +	unsigned char *hdr)
 +{
 +	int n = 1;
 +	unsigned char c;
 +
 +	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
 +		die("bad type %d", type);
 +
 +	c = (type << 4) | (size & 15);
 +	size >>= 4;
 +	while (size) {
 +		*hdr++ = c | 0x80;
 +		c = size & 0x7f;
 +		size >>= 7;
 +		n++;
 +	}
 +	*hdr = c;
 +	return n;
 +}
 +
 +static int store_object(
 +	enum object_type type,
 +	void *dat,
 +	size_t datlen,
 +	struct last_object *last,
 +	unsigned char *sha1out,
 +	uintmax_t mark)
 +{
 +	void *out, *delta;
 +	struct object_entry *e;
 +	unsigned char hdr[96];
 +	unsigned char sha1[20];
 +	unsigned long hdrlen, deltalen;
 +	SHA_CTX c;
 +	z_stream s;
 +
 +	hdrlen = sprintf((char*)hdr,"%s %lu", type_names[type],
 +		(unsigned long)datlen) + 1;
 +	SHA1_Init(&c);
 +	SHA1_Update(&c, hdr, hdrlen);
 +	SHA1_Update(&c, dat, datlen);
 +	SHA1_Final(sha1, &c);
 +	if (sha1out)
 +		hashcpy(sha1out, sha1);
 +
 +	e = insert_object(sha1);
 +	if (mark)
 +		insert_mark(mark, e);
 +	if (e->offset) {
 +		duplicate_count_by_type[type]++;
 +		return 1;
 +	}
 +
 +	if (last && last->data && last->depth < max_depth) {
 +		delta = diff_delta(last->data, last->len,
 +			dat, datlen,
 +			&deltalen, 0);
 +		if (delta && deltalen >= datlen) {
 +			free(delta);
 +			delta = NULL;
 +		}
 +	} else
 +		delta = NULL;
 +
 +	memset(&s, 0, sizeof(s));
 +	deflateInit(&s, zlib_compression_level);
 +	if (delta) {
 +		s.next_in = delta;
 +		s.avail_in = deltalen;
 +	} else {
 +		s.next_in = dat;
 +		s.avail_in = datlen;
 +	}
 +	s.avail_out = deflateBound(&s, s.avail_in);
 +	s.next_out = out = xmalloc(s.avail_out);
 +	while (deflate(&s, Z_FINISH) == Z_OK)
 +		/* nothing */;
 +	deflateEnd(&s);
 +
 +	/* Determine if we should auto-checkpoint. */
 +	if ((pack_size + 60 + s.total_out) > max_packsize
 +		|| (pack_size + 60 + s.total_out) < pack_size) {
 +
 +		/* This new object needs to *not* have the current pack_id. */
 +		e->pack_id = pack_id + 1;
 +		cycle_packfile();
 +
 +		/* We cannot carry a delta into the new pack. */
 +		if (delta) {
 +			free(delta);
 +			delta = NULL;
 +
 +			memset(&s, 0, sizeof(s));
 +			deflateInit(&s, zlib_compression_level);
 +			s.next_in = dat;
 +			s.avail_in = datlen;
 +			s.avail_out = deflateBound(&s, s.avail_in);
 +			s.next_out = out = xrealloc(out, s.avail_out);
 +			while (deflate(&s, Z_FINISH) == Z_OK)
 +				/* nothing */;
 +			deflateEnd(&s);
 +		}
 +	}
 +
 +	e->type = type;
 +	e->pack_id = pack_id;
 +	e->offset = pack_size;
 +	object_count++;
 +	object_count_by_type[type]++;
 +
 +	if (delta) {
 +		unsigned long ofs = e->offset - last->offset;
 +		unsigned pos = sizeof(hdr) - 1;
 +
 +		delta_count_by_type[type]++;
 +		last->depth++;
 +
 +		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
 +		write_or_die(pack_data->pack_fd, hdr, hdrlen);
 +		pack_size += hdrlen;
 +
 +		hdr[pos] = ofs & 127;
 +		while (ofs >>= 7)
 +			hdr[--pos] = 128 | (--ofs & 127);
 +		write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
 +		pack_size += sizeof(hdr) - pos;
 +	} else {
 +		if (last)
 +			last->depth = 0;
 +		hdrlen = encode_header(type, datlen, hdr);
 +		write_or_die(pack_data->pack_fd, hdr, hdrlen);
 +		pack_size += hdrlen;
 +	}
 +
 +	write_or_die(pack_data->pack_fd, out, s.total_out);
 +	pack_size += s.total_out;
 +
 +	free(out);
 +	free(delta);
 +	if (last) {
 +		if (!last->no_free)
 +			free(last->data);
 +		last->data = dat;
 +		last->offset = e->offset;
 +		last->len = datlen;
 +	}
 +	return 0;
 +}
 +
 +static void *gfi_unpack_entry(
 +	struct object_entry *oe,
 +	unsigned long *sizep)
 +{
 +	static char type[20];
 +	struct packed_git *p = all_packs[oe->pack_id];
 +	if (p == pack_data)
 +		p->pack_size = pack_size + 20;
 +	return unpack_entry(p, oe->offset, type, sizep);
 +}
 +
 +static const char *get_mode(const char *str, uint16_t *modep)
 +{
 +	unsigned char c;
 +	uint16_t mode = 0;
 +
 +	while ((c = *str++) != ' ') {
 +		if (c < '0' || c > '7')
 +			return NULL;
 +		mode = (mode << 3) + (c - '0');
 +	}
 +	*modep = mode;
 +	return str;
 +}
 +
 +static void load_tree(struct tree_entry *root)
 +{
 +	unsigned char* sha1 = root->versions[1].sha1;
 +	struct object_entry *myoe;
 +	struct tree_content *t;
 +	unsigned long size;
 +	char *buf;
 +	const char *c;
 +
 +	root->tree = t = new_tree_content(8);
 +	if (is_null_sha1(sha1))
 +		return;
 +
 +	myoe = find_object(sha1);
 +	if (myoe) {
 +		if (myoe->type != OBJ_TREE)
 +			die("Not a tree: %s", sha1_to_hex(sha1));
 +		t->delta_depth = 0;
 +		buf = gfi_unpack_entry(myoe, &size);
 +	} else {
 +		char type[20];
 +		buf = read_sha1_file(sha1, type, &size);
 +		if (!buf || strcmp(type, tree_type))
 +			die("Can't load tree %s", sha1_to_hex(sha1));
 +	}
 +
 +	c = buf;
 +	while (c != (buf + size)) {
 +		struct tree_entry *e = new_tree_entry();
 +
 +		if (t->entry_count == t->entry_capacity)
 +			root->tree = t = grow_tree_content(t, 8);
 +		t->entries[t->entry_count++] = e;
 +
 +		e->tree = NULL;
 +		c = get_mode(c, &e->versions[1].mode);
 +		if (!c)
 +			die("Corrupt mode in %s", sha1_to_hex(sha1));
 +		e->versions[0].mode = e->versions[1].mode;
 +		e->name = to_atom(c, (unsigned short)strlen(c));
 +		c += e->name->str_len + 1;
 +		hashcpy(e->versions[0].sha1, (unsigned char*)c);
 +		hashcpy(e->versions[1].sha1, (unsigned char*)c);
 +		c += 20;
 +	}
 +	free(buf);
 +}
 +
 +static int tecmp0 (const void *_a, const void *_b)
 +{
 +	struct tree_entry *a = *((struct tree_entry**)_a);
 +	struct tree_entry *b = *((struct tree_entry**)_b);
 +	return base_name_compare(
 +		a->name->str_dat, a->name->str_len, a->versions[0].mode,
 +		b->name->str_dat, b->name->str_len, b->versions[0].mode);
 +}
 +
 +static int tecmp1 (const void *_a, const void *_b)
 +{
 +	struct tree_entry *a = *((struct tree_entry**)_a);
 +	struct tree_entry *b = *((struct tree_entry**)_b);
 +	return base_name_compare(
 +		a->name->str_dat, a->name->str_len, a->versions[1].mode,
 +		b->name->str_dat, b->name->str_len, b->versions[1].mode);
 +}
 +
 +static void mktree(struct tree_content *t,
 +	int v,
 +	unsigned long *szp,
 +	struct dbuf *b)
 +{
 +	size_t maxlen = 0;
 +	unsigned int i;
 +	char *c;
 +
 +	if (!v)
 +		qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
 +	else
 +		qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
 +
 +	for (i = 0; i < t->entry_count; i++) {
 +		if (t->entries[i]->versions[v].mode)
 +			maxlen += t->entries[i]->name->str_len + 34;
 +	}
 +
 +	size_dbuf(b, maxlen);
 +	c = b->buffer;
 +	for (i = 0; i < t->entry_count; i++) {
 +		struct tree_entry *e = t->entries[i];
 +		if (!e->versions[v].mode)
 +			continue;
 +		c += sprintf(c, "%o", (unsigned int)e->versions[v].mode);
 +		*c++ = ' ';
 +		strcpy(c, e->name->str_dat);
 +		c += e->name->str_len + 1;
 +		hashcpy((unsigned char*)c, e->versions[v].sha1);
 +		c += 20;
 +	}
 +	*szp = c - (char*)b->buffer;
 +}
 +
 +static void store_tree(struct tree_entry *root)
 +{
 +	struct tree_content *t = root->tree;
 +	unsigned int i, j, del;
 +	unsigned long new_len;
 +	struct last_object lo;
 +	struct object_entry *le;
 +
 +	if (!is_null_sha1(root->versions[1].sha1))
 +		return;
 +
 +	for (i = 0; i < t->entry_count; i++) {
 +		if (t->entries[i]->tree)
 +			store_tree(t->entries[i]);
 +	}
 +
 +	le = find_object(root->versions[0].sha1);
 +	if (!S_ISDIR(root->versions[0].mode)
 +		|| !le
 +		|| le->pack_id != pack_id) {
 +		lo.data = NULL;
 +		lo.depth = 0;
 +	} else {
 +		mktree(t, 0, &lo.len, &old_tree);
 +		lo.data = old_tree.buffer;
 +		lo.offset = le->offset;
 +		lo.depth = t->delta_depth;
 +		lo.no_free = 1;
 +	}
 +
 +	mktree(t, 1, &new_len, &new_tree);
 +	store_object(OBJ_TREE, new_tree.buffer, new_len,
 +		&lo, root->versions[1].sha1, 0);
 +
 +	t->delta_depth = lo.depth;
 +	for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
 +		struct tree_entry *e = t->entries[i];
 +		if (e->versions[1].mode) {
 +			e->versions[0].mode = e->versions[1].mode;
 +			hashcpy(e->versions[0].sha1, e->versions[1].sha1);
 +			t->entries[j++] = e;
 +		} else {
 +			release_tree_entry(e);
 +			del++;
 +		}
 +	}
 +	t->entry_count -= del;
 +}
 +
 +static int tree_content_set(
 +	struct tree_entry *root,
 +	const char *p,
 +	const unsigned char *sha1,
 +	const uint16_t mode)
 +{
 +	struct tree_content *t = root->tree;
 +	const char *slash1;
 +	unsigned int i, n;
 +	struct tree_entry *e;
 +
 +	slash1 = strchr(p, '/');
 +	if (slash1)
 +		n = slash1 - p;
 +	else
 +		n = strlen(p);
 +
 +	for (i = 0; i < t->entry_count; i++) {
 +		e = t->entries[i];
 +		if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
 +			if (!slash1) {
 +				if (e->versions[1].mode == mode
 +						&& !hashcmp(e->versions[1].sha1, sha1))
 +					return 0;
 +				e->versions[1].mode = mode;
 +				hashcpy(e->versions[1].sha1, sha1);
 +				if (e->tree) {
 +					release_tree_content_recursive(e->tree);
 +					e->tree = NULL;
 +				}
 +				hashclr(root->versions[1].sha1);
 +				return 1;
 +			}
 +			if (!S_ISDIR(e->versions[1].mode)) {
 +				e->tree = new_tree_content(8);
 +				e->versions[1].mode = S_IFDIR;
 +			}
 +			if (!e->tree)
 +				load_tree(e);
 +			if (tree_content_set(e, slash1 + 1, sha1, mode)) {
 +				hashclr(root->versions[1].sha1);
 +				return 1;
 +			}
 +			return 0;
 +		}
 +	}
 +
 +	if (t->entry_count == t->entry_capacity)
 +		root->tree = t = grow_tree_content(t, 8);
 +	e = new_tree_entry();
 +	e->name = to_atom(p, (unsigned short)n);
 +	e->versions[0].mode = 0;
 +	hashclr(e->versions[0].sha1);
 +	t->entries[t->entry_count++] = e;
 +	if (slash1) {
 +		e->tree = new_tree_content(8);
 +		e->versions[1].mode = S_IFDIR;
 +		tree_content_set(e, slash1 + 1, sha1, mode);
 +	} else {
 +		e->tree = NULL;
 +		e->versions[1].mode = mode;
 +		hashcpy(e->versions[1].sha1, sha1);
 +	}
 +	hashclr(root->versions[1].sha1);
 +	return 1;
 +}
 +
 +static int tree_content_remove(struct tree_entry *root, const char *p)
 +{
 +	struct tree_content *t = root->tree;
 +	const char *slash1;
 +	unsigned int i, n;
 +	struct tree_entry *e;
 +
 +	slash1 = strchr(p, '/');
 +	if (slash1)
 +		n = slash1 - p;
 +	else
 +		n = strlen(p);
 +
 +	for (i = 0; i < t->entry_count; i++) {
 +		e = t->entries[i];
 +		if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
 +			if (!slash1 || !S_ISDIR(e->versions[1].mode))
 +				goto del_entry;
 +			if (!e->tree)
 +				load_tree(e);
 +			if (tree_content_remove(e, slash1 + 1)) {
 +				for (n = 0; n < e->tree->entry_count; n++) {
 +					if (e->tree->entries[n]->versions[1].mode) {
 +						hashclr(root->versions[1].sha1);
 +						return 1;
 +					}
 +				}
 +				goto del_entry;
 +			}
 +			return 0;
 +		}
 +	}
 +	return 0;
 +
 +del_entry:
 +	if (e->tree) {
 +		release_tree_content_recursive(e->tree);
 +		e->tree = NULL;
 +	}
 +	e->versions[1].mode = 0;
 +	hashclr(e->versions[1].sha1);
 +	hashclr(root->versions[1].sha1);
 +	return 1;
 +}
 +
 +static int update_branch(struct branch *b)
 +{
 +	static const char *msg = "fast-import";
 +	struct ref_lock *lock;
 +	unsigned char old_sha1[20];
 +
 +	if (read_ref(b->name, old_sha1))
 +		hashclr(old_sha1);
 +	lock = lock_any_ref_for_update(b->name, old_sha1);
 +	if (!lock)
 +		return error("Unable to lock %s", b->name);
 +	if (!force_update && !is_null_sha1(old_sha1)) {
 +		struct commit *old_cmit, *new_cmit;
 +
 +		old_cmit = lookup_commit_reference_gently(old_sha1, 0);
 +		new_cmit = lookup_commit_reference_gently(b->sha1, 0);
 +		if (!old_cmit || !new_cmit) {
 +			unlock_ref(lock);
 +			return error("Branch %s is missing commits.", b->name);
 +		}
 +
- 		if (!in_merge_bases(old_cmit, new_cmit)) {
++		if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
 +			unlock_ref(lock);
 +			warn("Not updating %s"
 +				" (new tip %s does not contain %s)",
 +				b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
 +			return -1;
 +		}
 +	}
 +	if (write_ref_sha1(lock, b->sha1, msg) < 0)
 +		return error("Unable to update %s", b->name);
 +	return 0;
 +}
 +
 +static void dump_branches(void)
 +{
 +	unsigned int i;
 +	struct branch *b;
 +
 +	for (i = 0; i < branch_table_sz; i++) {
 +		for (b = branch_table[i]; b; b = b->table_next_branch)
 +			failure |= update_branch(b);
 +	}
 +}
 +
 +static void dump_tags(void)
 +{
 +	static const char *msg = "fast-import";
 +	struct tag *t;
 +	struct ref_lock *lock;
 +	char ref_name[PATH_MAX];
 +
 +	for (t = first_tag; t; t = t->next_tag) {
 +		sprintf(ref_name, "tags/%s", t->name);
 +		lock = lock_ref_sha1(ref_name, NULL);
 +		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
 +			failure |= error("Unable to update %s", ref_name);
 +	}
 +}
 +
 +static void dump_marks_helper(FILE *f,
 +	uintmax_t base,
 +	struct mark_set *m)
 +{
 +	uintmax_t k;
 +	if (m->shift) {
 +		for (k = 0; k < 1024; k++) {
 +			if (m->data.sets[k])
 +				dump_marks_helper(f, (base + k) << m->shift,
 +					m->data.sets[k]);
 +		}
 +	} else {
 +		for (k = 0; k < 1024; k++) {
 +			if (m->data.marked[k])
 +				fprintf(f, ":%ju %s\n", base + k,
 +					sha1_to_hex(m->data.marked[k]->sha1));
 +		}
 +	}
 +}
 +
 +static void dump_marks(void)
 +{
 +	if (mark_file)
 +	{
 +		FILE *f = fopen(mark_file, "w");
 +		if (f) {
 +			dump_marks_helper(f, 0, marks);
 +			fclose(f);
 +		} else
 +			failure |= error("Unable to write marks file %s: %s",
 +				mark_file, strerror(errno));
 +	}
 +}
 +
 +static void read_next_command(void)
 +{
 +	read_line(&command_buf, stdin, '\n');
 +}
 +
 +static void cmd_mark(void)
 +{
 +	if (!strncmp("mark :", command_buf.buf, 6)) {
 +		next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
 +		read_next_command();
 +	}
 +	else
 +		next_mark = 0;
 +}
 +
 +static void *cmd_data (size_t *size)
 +{
 +	size_t length;
 +	char *buffer;
 +
 +	if (strncmp("data ", command_buf.buf, 5))
 +		die("Expected 'data n' command, found: %s", command_buf.buf);
 +
 +	if (!strncmp("<<", command_buf.buf + 5, 2)) {
 +		char *term = xstrdup(command_buf.buf + 5 + 2);
 +		size_t sz = 8192, term_len = command_buf.len - 5 - 2;
 +		length = 0;
 +		buffer = xmalloc(sz);
 +		for (;;) {
 +			read_next_command();
 +			if (command_buf.eof)
 +				die("EOF in data (terminator '%s' not found)", term);
 +			if (term_len == command_buf.len
 +				&& !strcmp(term, command_buf.buf))
 +				break;
 +			if (sz < (length + command_buf.len)) {
 +				sz = sz * 3 / 2 + 16;
 +				if (sz < (length + command_buf.len))
 +					sz = length + command_buf.len;
 +				buffer = xrealloc(buffer, sz);
 +			}
 +			memcpy(buffer + length,
 +				command_buf.buf,
 +				command_buf.len - 1);
 +			length += command_buf.len - 1;
 +			buffer[length++] = '\n';
 +		}
 +		free(term);
 +	}
 +	else {
 +		size_t n = 0;
 +		length = strtoul(command_buf.buf + 5, NULL, 10);
 +		buffer = xmalloc(length);
 +		while (n < length) {
 +			size_t s = fread(buffer + n, 1, length - n, stdin);
 +			if (!s && feof(stdin))
 +				die("EOF in data (%lu bytes remaining)",
 +					(unsigned long)(length - n));
 +			n += s;
 +		}
 +	}
 +
 +	if (fgetc(stdin) != '\n')
 +		die("An lf did not trail the binary data as expected.");
 +
 +	*size = length;
 +	return buffer;
 +}
 +
 +static int validate_raw_date(const char *src, char *result, int maxlen)
 +{
 +	const char *orig_src = src;
 +	char *endp, sign;
 +
 +	strtoul(src, &endp, 10);
 +	if (endp == src || *endp != ' ')
 +		return -1;
 +
 +	src = endp + 1;
 +	if (*src != '-' && *src != '+')
 +		return -1;
 +	sign = *src;
 +
 +	strtoul(src + 1, &endp, 10);
 +	if (endp == src || *endp || (endp - orig_src) >= maxlen)
 +		return -1;
 +
 +	strcpy(result, orig_src);
 +	return 0;
 +}
 +
 +static char *parse_ident(const char *buf)
 +{
 +	const char *gt;
 +	size_t name_len;
 +	char *ident;
 +
 +	gt = strrchr(buf, '>');
 +	if (!gt)
 +		die("Missing > in ident string: %s", buf);
 +	gt++;
 +	if (*gt != ' ')
 +		die("Missing space after > in ident string: %s", buf);
 +	gt++;
 +	name_len = gt - buf;
 +	ident = xmalloc(name_len + 24);
 +	strncpy(ident, buf, name_len);
 +
 +	switch (whenspec) {
 +	case WHENSPEC_RAW:
 +		if (validate_raw_date(gt, ident + name_len, 24) < 0)
 +			die("Invalid raw date \"%s\" in ident: %s", gt, buf);
 +		break;
 +	case WHENSPEC_RFC2822:
 +		if (parse_date(gt, ident + name_len, 24) < 0)
 +			die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
 +		break;
 +	case WHENSPEC_NOW:
 +		if (strcmp("now", gt))
 +			die("Date in ident must be 'now': %s", buf);
 +		datestamp(ident + name_len, 24);
 +		break;
 +	}
 +
 +	return ident;
 +}
 +
 +static void cmd_new_blob(void)
 +{
 +	size_t l;
 +	void *d;
 +
 +	read_next_command();
 +	cmd_mark();
 +	d = cmd_data(&l);
 +
 +	if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
 +		free(d);
 +}
 +
 +static void unload_one_branch(void)
 +{
 +	while (cur_active_branches
 +		&& cur_active_branches >= max_active_branches) {
 +		unsigned long min_commit = ULONG_MAX;
 +		struct branch *e, *l = NULL, *p = NULL;
 +
 +		for (e = active_branches; e; e = e->active_next_branch) {
 +			if (e->last_commit < min_commit) {
 +				p = l;
 +				min_commit = e->last_commit;
 +			}
 +			l = e;
 +		}
 +
 +		if (p) {
 +			e = p->active_next_branch;
 +			p->active_next_branch = e->active_next_branch;
 +		} else {
 +			e = active_branches;
 +			active_branches = e->active_next_branch;
 +		}
 +		e->active_next_branch = NULL;
 +		if (e->branch_tree.tree) {
 +			release_tree_content_recursive(e->branch_tree.tree);
 +			e->branch_tree.tree = NULL;
 +		}
 +		cur_active_branches--;
 +	}
 +}
 +
 +static void load_branch(struct branch *b)
 +{
 +	load_tree(&b->branch_tree);
 +	b->active_next_branch = active_branches;
 +	active_branches = b;
 +	cur_active_branches++;
 +	branch_load_count++;
 +}
 +
 +static void file_change_m(struct branch *b)
 +{
 +	const char *p = command_buf.buf + 2;
 +	char *p_uq;
 +	const char *endp;
 +	struct object_entry *oe = oe;
 +	unsigned char sha1[20];
 +	uint16_t mode, inline_data = 0;
 +	char type[20];
 +
 +	p = get_mode(p, &mode);
 +	if (!p)
 +		die("Corrupt mode: %s", command_buf.buf);
 +	switch (mode) {
 +	case S_IFREG | 0644:
 +	case S_IFREG | 0755:
 +	case S_IFLNK:
 +	case 0644:
 +	case 0755:
 +		/* ok */
 +		break;
 +	default:
 +		die("Corrupt mode: %s", command_buf.buf);
 +	}
 +
 +	if (*p == ':') {
 +		char *x;
 +		oe = find_mark(strtoumax(p + 1, &x, 10));
 +		hashcpy(sha1, oe->sha1);
 +		p = x;
 +	} else if (!strncmp("inline", p, 6)) {
 +		inline_data = 1;
 +		p += 6;
 +	} else {
 +		if (get_sha1_hex(p, sha1))
 +			die("Invalid SHA1: %s", command_buf.buf);
 +		oe = find_object(sha1);
 +		p += 40;
 +	}
 +	if (*p++ != ' ')
 +		die("Missing space after SHA1: %s", command_buf.buf);
 +
 +	p_uq = unquote_c_style(p, &endp);
 +	if (p_uq) {
 +		if (*endp)
 +			die("Garbage after path in: %s", command_buf.buf);
 +		p = p_uq;
 +	}
 +
 +	if (inline_data) {
 +		size_t l;
 +		void *d;
 +		if (!p_uq)
 +			p = p_uq = xstrdup(p);
 +		read_next_command();
 +		d = cmd_data(&l);
 +		if (store_object(OBJ_BLOB, d, l, &last_blob, sha1, 0))
 +			free(d);
 +	} else if (oe) {
 +		if (oe->type != OBJ_BLOB)
 +			die("Not a blob (actually a %s): %s",
 +				command_buf.buf, type_names[oe->type]);
 +	} else {
 +		if (sha1_object_info(sha1, type, NULL))
 +			die("Blob not found: %s", command_buf.buf);
 +		if (strcmp(blob_type, type))
 +			die("Not a blob (actually a %s): %s",
 +				command_buf.buf, type);
 +	}
 +
 +	tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);
 +	free(p_uq);
 +}
 +
 +static void file_change_d(struct branch *b)
 +{
 +	const char *p = command_buf.buf + 2;
 +	char *p_uq;
 +	const char *endp;
 +
 +	p_uq = unquote_c_style(p, &endp);
 +	if (p_uq) {
 +		if (*endp)
 +			die("Garbage after path in: %s", command_buf.buf);
 +		p = p_uq;
 +	}
 +	tree_content_remove(&b->branch_tree, p);
 +	free(p_uq);
 +}
 +
 +static void file_change_deleteall(struct branch *b)
 +{
 +	release_tree_content_recursive(b->branch_tree.tree);
 +	hashclr(b->branch_tree.versions[0].sha1);
 +	hashclr(b->branch_tree.versions[1].sha1);
 +	load_tree(&b->branch_tree);
 +}
 +
 +static void cmd_from(struct branch *b)
 +{
 +	const char *from;
 +	struct branch *s;
 +
 +	if (strncmp("from ", command_buf.buf, 5))
 +		return;
 +
 +	if (b->branch_tree.tree) {
 +		release_tree_content_recursive(b->branch_tree.tree);
 +		b->branch_tree.tree = NULL;
 +	}
 +
 +	from = strchr(command_buf.buf, ' ') + 1;
 +	s = lookup_branch(from);
 +	if (b == s)
 +		die("Can't create a branch from itself: %s", b->name);
 +	else if (s) {
 +		unsigned char *t = s->branch_tree.versions[1].sha1;
 +		hashcpy(b->sha1, s->sha1);
 +		hashcpy(b->branch_tree.versions[0].sha1, t);
 +		hashcpy(b->branch_tree.versions[1].sha1, t);
 +	} else if (*from == ':') {
 +		uintmax_t idnum = strtoumax(from + 1, NULL, 10);
 +		struct object_entry *oe = find_mark(idnum);
 +		unsigned long size;
 +		char *buf;
 +		if (oe->type != OBJ_COMMIT)
 +			die("Mark :%ju not a commit", idnum);
 +		hashcpy(b->sha1, oe->sha1);
 +		buf = gfi_unpack_entry(oe, &size);
 +		if (!buf || size < 46)
 +			die("Not a valid commit: %s", from);
 +		if (memcmp("tree ", buf, 5)
 +			|| get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
 +			die("The commit %s is corrupt", sha1_to_hex(b->sha1));
 +		free(buf);
 +		hashcpy(b->branch_tree.versions[0].sha1,
 +			b->branch_tree.versions[1].sha1);
 +	} else if (!get_sha1(from, b->sha1)) {
 +		if (is_null_sha1(b->sha1)) {
 +			hashclr(b->branch_tree.versions[0].sha1);
 +			hashclr(b->branch_tree.versions[1].sha1);
 +		} else {
 +			unsigned long size;
 +			char *buf;
 +
 +			buf = read_object_with_reference(b->sha1,
 +				type_names[OBJ_COMMIT], &size, b->sha1);
 +			if (!buf || size < 46)
 +				die("Not a valid commit: %s", from);
 +			if (memcmp("tree ", buf, 5)
 +				|| get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
 +				die("The commit %s is corrupt", sha1_to_hex(b->sha1));
 +			free(buf);
 +			hashcpy(b->branch_tree.versions[0].sha1,
 +				b->branch_tree.versions[1].sha1);
 +		}
 +	} else
 +		die("Invalid ref name or SHA1 expression: %s", from);
 +
 +	read_next_command();
 +}
 +
 +static struct hash_list *cmd_merge(unsigned int *count)
 +{
 +	struct hash_list *list = NULL, *n, *e = e;
 +	const char *from;
 +	struct branch *s;
 +
 +	*count = 0;
 +	while (!strncmp("merge ", command_buf.buf, 6)) {
 +		from = strchr(command_buf.buf, ' ') + 1;
 +		n = xmalloc(sizeof(*n));
 +		s = lookup_branch(from);
 +		if (s)
 +			hashcpy(n->sha1, s->sha1);
 +		else if (*from == ':') {
 +			uintmax_t idnum = strtoumax(from + 1, NULL, 10);
 +			struct object_entry *oe = find_mark(idnum);
 +			if (oe->type != OBJ_COMMIT)
 +				die("Mark :%ju not a commit", idnum);
 +			hashcpy(n->sha1, oe->sha1);
 +		} else if (get_sha1(from, n->sha1))
 +			die("Invalid ref name or SHA1 expression: %s", from);
 +
 +		n->next = NULL;
 +		if (list)
 +			e->next = n;
 +		else
 +			list = n;
 +		e = n;
 +		(*count)++;
 +		read_next_command();
 +	}
 +	return list;
 +}
 +
 +static void cmd_new_commit(void)
 +{
 +	struct branch *b;
 +	void *msg;
 +	size_t msglen;
 +	char *sp;
 +	char *author = NULL;
 +	char *committer = NULL;
 +	struct hash_list *merge_list = NULL;
 +	unsigned int merge_count;
 +
 +	/* Obtain the branch name from the rest of our command */
 +	sp = strchr(command_buf.buf, ' ') + 1;
 +	b = lookup_branch(sp);
 +	if (!b)
 +		b = new_branch(sp);
 +
 +	read_next_command();
 +	cmd_mark();
 +	if (!strncmp("author ", command_buf.buf, 7)) {
 +		author = parse_ident(command_buf.buf + 7);
 +		read_next_command();
 +	}
 +	if (!strncmp("committer ", command_buf.buf, 10)) {
 +		committer = parse_ident(command_buf.buf + 10);
 +		read_next_command();
 +	}
 +	if (!committer)
 +		die("Expected committer but didn't get one");
 +	msg = cmd_data(&msglen);
 +	read_next_command();
 +	cmd_from(b);
 +	merge_list = cmd_merge(&merge_count);
 +
 +	/* ensure the branch is active/loaded */
 +	if (!b->branch_tree.tree || !max_active_branches) {
 +		unload_one_branch();
 +		load_branch(b);
 +	}
 +
 +	/* file_change* */
 +	for (;;) {
 +		if (1 == command_buf.len)
 +			break;
 +		else if (!strncmp("M ", command_buf.buf, 2))
 +			file_change_m(b);
 +		else if (!strncmp("D ", command_buf.buf, 2))
 +			file_change_d(b);
 +		else if (!strcmp("deleteall", command_buf.buf))
 +			file_change_deleteall(b);
 +		else
 +			die("Unsupported file_change: %s", command_buf.buf);
 +		read_next_command();
 +	}
 +
 +	/* build the tree and the commit */
 +	store_tree(&b->branch_tree);
 +	hashcpy(b->branch_tree.versions[0].sha1,
 +		b->branch_tree.versions[1].sha1);
 +	size_dbuf(&new_data, 114 + msglen
 +		+ merge_count * 49
 +		+ (author
 +			? strlen(author) + strlen(committer)
 +			: 2 * strlen(committer)));
 +	sp = new_data.buffer;
 +	sp += sprintf(sp, "tree %s\n",
 +		sha1_to_hex(b->branch_tree.versions[1].sha1));
 +	if (!is_null_sha1(b->sha1))
 +		sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
 +	while (merge_list) {
 +		struct hash_list *next = merge_list->next;
 +		sp += sprintf(sp, "parent %s\n", sha1_to_hex(merge_list->sha1));
 +		free(merge_list);
 +		merge_list = next;
 +	}
 +	sp += sprintf(sp, "author %s\n", author ? author : committer);
 +	sp += sprintf(sp, "committer %s\n", committer);
 +	*sp++ = '\n';
 +	memcpy(sp, msg, msglen);
 +	sp += msglen;
 +	free(author);
 +	free(committer);
 +	free(msg);
 +
 +	if (!store_object(OBJ_COMMIT,
 +		new_data.buffer, sp - (char*)new_data.buffer,
 +		NULL, b->sha1, next_mark))
 +		b->pack_id = pack_id;
 +	b->last_commit = object_count_by_type[OBJ_COMMIT];
 +}
 +
 +static void cmd_new_tag(void)
 +{
 +	char *sp;
 +	const char *from;
 +	char *tagger;
 +	struct branch *s;
 +	void *msg;
 +	size_t msglen;
 +	struct tag *t;
 +	uintmax_t from_mark = 0;
 +	unsigned char sha1[20];
 +
 +	/* Obtain the new tag name from the rest of our command */
 +	sp = strchr(command_buf.buf, ' ') + 1;
 +	t = pool_alloc(sizeof(struct tag));
 +	t->next_tag = NULL;
 +	t->name = pool_strdup(sp);
 +	if (last_tag)
 +		last_tag->next_tag = t;
 +	else
 +		first_tag = t;
 +	last_tag = t;
 +	read_next_command();
 +
 +	/* from ... */
 +	if (strncmp("from ", command_buf.buf, 5))
 +		die("Expected from command, got %s", command_buf.buf);
 +	from = strchr(command_buf.buf, ' ') + 1;
 +	s = lookup_branch(from);
 +	if (s) {
 +		hashcpy(sha1, s->sha1);
 +	} else if (*from == ':') {
 +		struct object_entry *oe;
 +		from_mark = strtoumax(from + 1, NULL, 10);
 +		oe = find_mark(from_mark);
 +		if (oe->type != OBJ_COMMIT)
 +			die("Mark :%ju not a commit", from_mark);
 +		hashcpy(sha1, oe->sha1);
 +	} else if (!get_sha1(from, sha1)) {
 +		unsigned long size;
 +		char *buf;
 +
 +		buf = read_object_with_reference(sha1,
 +			type_names[OBJ_COMMIT], &size, sha1);
 +		if (!buf || size < 46)
 +			die("Not a valid commit: %s", from);
 +		free(buf);
 +	} else
 +		die("Invalid ref name or SHA1 expression: %s", from);
 +	read_next_command();
 +
 +	/* tagger ... */
 +	if (strncmp("tagger ", command_buf.buf, 7))
 +		die("Expected tagger command, got %s", command_buf.buf);
 +	tagger = parse_ident(command_buf.buf + 7);
 +
 +	/* tag payload/message */
 +	read_next_command();
 +	msg = cmd_data(&msglen);
 +
 +	/* build the tag object */
 +	size_dbuf(&new_data, 67+strlen(t->name)+strlen(tagger)+msglen);
 +	sp = new_data.buffer;
 +	sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
 +	sp += sprintf(sp, "type %s\n", type_names[OBJ_COMMIT]);
 +	sp += sprintf(sp, "tag %s\n", t->name);
 +	sp += sprintf(sp, "tagger %s\n", tagger);
 +	*sp++ = '\n';
 +	memcpy(sp, msg, msglen);
 +	sp += msglen;
 +	free(tagger);
 +	free(msg);
 +
 +	if (store_object(OBJ_TAG, new_data.buffer,
 +		sp - (char*)new_data.buffer,
 +		NULL, t->sha1, 0))
 +		t->pack_id = MAX_PACK_ID;
 +	else
 +		t->pack_id = pack_id;
 +}
 +
 +static void cmd_reset_branch(void)
 +{
 +	struct branch *b;
 +	char *sp;
 +
 +	/* Obtain the branch name from the rest of our command */
 +	sp = strchr(command_buf.buf, ' ') + 1;
 +	b = lookup_branch(sp);
 +	if (b) {
 +		hashclr(b->sha1);
 +		hashclr(b->branch_tree.versions[0].sha1);
 +		hashclr(b->branch_tree.versions[1].sha1);
 +		if (b->branch_tree.tree) {
 +			release_tree_content_recursive(b->branch_tree.tree);
 +			b->branch_tree.tree = NULL;
 +		}
 +	}
 +	else
 +		b = new_branch(sp);
 +	read_next_command();
 +	cmd_from(b);
 +}
 +
 +static void cmd_checkpoint(void)
 +{
 +	if (object_count) {
 +		cycle_packfile();
 +		dump_branches();
 +		dump_tags();
 +		dump_marks();
 +	}
 +	read_next_command();
 +}
 +
 +static const char fast_import_usage[] =
 +"git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
 +
 +int main(int argc, const char **argv)
 +{
 +	int i, show_stats = 1;
 +
 +	git_config(git_default_config);
 +
 +	for (i = 1; i < argc; i++) {
 +		const char *a = argv[i];
 +
 +		if (*a != '-' || !strcmp(a, "--"))
 +			break;
 +		else if (!strncmp(a, "--date-format=", 14)) {
 +			const char *fmt = a + 14;
 +			if (!strcmp(fmt, "raw"))
 +				whenspec = WHENSPEC_RAW;
 +			else if (!strcmp(fmt, "rfc2822"))
 +				whenspec = WHENSPEC_RFC2822;
 +			else if (!strcmp(fmt, "now"))
 +				whenspec = WHENSPEC_NOW;
 +			else
 +				die("unknown --date-format argument %s", fmt);
 +		}
 +		else if (!strncmp(a, "--max-pack-size=", 16))
 +			max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
 +		else if (!strncmp(a, "--depth=", 8))
 +			max_depth = strtoul(a + 8, NULL, 0);
 +		else if (!strncmp(a, "--active-branches=", 18))
 +			max_active_branches = strtoul(a + 18, NULL, 0);
 +		else if (!strncmp(a, "--export-marks=", 15))
 +			mark_file = a + 15;
 +		else if (!strncmp(a, "--export-pack-edges=", 20)) {
 +			if (pack_edges)
 +				fclose(pack_edges);
 +			pack_edges = fopen(a + 20, "a");
 +			if (!pack_edges)
 +				die("Cannot open %s: %s", a + 20, strerror(errno));
 +		} else if (!strcmp(a, "--force"))
 +			force_update = 1;
 +		else if (!strcmp(a, "--quiet"))
 +			show_stats = 0;
 +		else if (!strcmp(a, "--stats"))
 +			show_stats = 1;
 +		else
 +			die("unknown option %s", a);
 +	}
 +	if (i != argc)
 +		usage(fast_import_usage);
 +
 +	alloc_objects(object_entry_alloc);
 +	strbuf_init(&command_buf);
 +
 +	atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
 +	branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
 +	avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
 +	marks = pool_calloc(1, sizeof(struct mark_set));
 +
 +	start_packfile();
 +	for (;;) {
 +		read_next_command();
 +		if (command_buf.eof)
 +			break;
 +		else if (!strcmp("blob", command_buf.buf))
 +			cmd_new_blob();
 +		else if (!strncmp("commit ", command_buf.buf, 7))
 +			cmd_new_commit();
 +		else if (!strncmp("tag ", command_buf.buf, 4))
 +			cmd_new_tag();
 +		else if (!strncmp("reset ", command_buf.buf, 6))
 +			cmd_reset_branch();
 +		else if (!strcmp("checkpoint", command_buf.buf))
 +			cmd_checkpoint();
 +		else
 +			die("Unsupported command: %s", command_buf.buf);
 +	}
 +	end_packfile();
 +
 +	dump_branches();
 +	dump_tags();
 +	unkeep_all_packs();
 +	dump_marks();
 +
 +	if (pack_edges)
 +		fclose(pack_edges);
 +
 +	if (show_stats) {
 +		uintmax_t total_count = 0, duplicate_count = 0;
 +		for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
 +			total_count += object_count_by_type[i];
 +		for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
 +			duplicate_count += duplicate_count_by_type[i];
 +
 +		fprintf(stderr, "%s statistics:\n", argv[0]);
 +		fprintf(stderr, "---------------------------------------------------------------------\n");
 +		fprintf(stderr, "Alloc'd objects: %10ju\n", alloc_count);
 +		fprintf(stderr, "Total objects:   %10ju (%10ju duplicates                  )\n", total_count, duplicate_count);
 +		fprintf(stderr, "      blobs  :   %10ju (%10ju duplicates %10ju deltas)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB]);
 +		fprintf(stderr, "      trees  :   %10ju (%10ju duplicates %10ju deltas)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE]);
 +		fprintf(stderr, "      commits:   %10ju (%10ju duplicates %10ju deltas)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT]);
 +		fprintf(stderr, "      tags   :   %10ju (%10ju duplicates %10ju deltas)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG]);
 +		fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
 +		fprintf(stderr, "      marks:     %10ju (%10ju unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
 +		fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
 +		fprintf(stderr, "Memory total:    %10ju KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
 +		fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
 +		fprintf(stderr, "     objects:    %10ju KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
 +		fprintf(stderr, "---------------------------------------------------------------------\n");
 +		pack_report();
 +		fprintf(stderr, "---------------------------------------------------------------------\n");
 +		fprintf(stderr, "\n");
 +	}
 +
 +	return failure ? 1 : 0;
 +}
diff --combined git.c
index 6e6c44822c,e7bc79af93..4dd196721f
--- a/git.c
+++ b/git.c
@@@ -159,16 -159,6 +159,16 @@@ static int handle_alias(int *argcp, con
  	alias_command = (*argv)[0];
  	git_config(git_alias_config);
  	if (alias_string) {
 +		if (alias_string[0] == '!') {
 +			trace_printf("trace: alias to shell cmd: %s => %s\n",
 +				     alias_command, alias_string + 1);
 +			ret = system(alias_string + 1);
 +			if (ret >= 0 && WIFEXITED(ret) &&
 +			    WEXITSTATUS(ret) != 127)
 +				exit(WEXITSTATUS(ret));
 +			die("Failed to run '%s' when expanding alias '%s'\n",
 +			    alias_string + 1, alias_command);
 +		}
  		count = split_cmdline(alias_string, &new_argv);
  		option_count = handle_options(&new_argv, &count);
  		memmove(new_argv - option_count, new_argv,
@@@ -209,11 -199,6 +209,11 @@@ const char git_version_string[] = GIT_V
  
  #define RUN_SETUP	(1<<0)
  #define USE_PAGER	(1<<1)
 +/*
 + * require working tree to be present -- anything uses this needs
 + * RUN_SETUP for reading from the configuration file.
 + */
 +#define NOT_BARE 	(1<<2)
  
  static void handle_internal_command(int argc, const char **argv, char **envp)
  {
@@@ -223,29 -208,26 +223,29 @@@
  		int (*fn)(int, const char **, const char *);
  		int option;
  	} commands[] = {
 -		{ "add", cmd_add, RUN_SETUP },
 -		{ "annotate", cmd_annotate, },
 +		{ "add", cmd_add, RUN_SETUP | NOT_BARE },
 +		{ "annotate", cmd_annotate, USE_PAGER },
  		{ "apply", cmd_apply },
  		{ "archive", cmd_archive },
 -		{ "blame", cmd_blame, RUN_SETUP | USE_PAGER },
 +		{ "blame", cmd_blame, RUN_SETUP },
  		{ "branch", cmd_branch, RUN_SETUP },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "checkout-index", cmd_checkout_index, RUN_SETUP },
  		{ "check-ref-format", cmd_check_ref_format },
  		{ "cherry", cmd_cherry, RUN_SETUP },
  		{ "commit-tree", cmd_commit_tree, RUN_SETUP },
 +		{ "config", cmd_config },
  		{ "count-objects", cmd_count_objects, RUN_SETUP },
 +		{ "describe", cmd_describe, RUN_SETUP },
  		{ "diff", cmd_diff, RUN_SETUP | USE_PAGER },
  		{ "diff-files", cmd_diff_files, RUN_SETUP },
  		{ "diff-index", cmd_diff_index, RUN_SETUP },
 -		{ "diff-stages", cmd_diff_stages, RUN_SETUP },
  		{ "diff-tree", cmd_diff_tree, RUN_SETUP },
  		{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
  		{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
  		{ "format-patch", cmd_format_patch, RUN_SETUP },
 +		{ "fsck", cmd_fsck, RUN_SETUP },
 +		{ "fsck-objects", cmd_fsck, RUN_SETUP },
  		{ "get-tar-commit-id", cmd_get_tar_commit_id },
  		{ "grep", cmd_grep, RUN_SETUP },
  		{ "help", cmd_help },
@@@ -256,8 -238,9 +256,9 @@@
  		{ "ls-tree", cmd_ls_tree, RUN_SETUP },
  		{ "mailinfo", cmd_mailinfo },
  		{ "mailsplit", cmd_mailsplit },
+ 		{ "merge-base", cmd_merge_base, RUN_SETUP },
  		{ "merge-file", cmd_merge_file },
 -		{ "mv", cmd_mv, RUN_SETUP },
 +		{ "mv", cmd_mv, RUN_SETUP | NOT_BARE },
  		{ "name-rev", cmd_name_rev, RUN_SETUP },
  		{ "pack-objects", cmd_pack_objects, RUN_SETUP },
  		{ "pickaxe", cmd_blame, RUN_SETUP | USE_PAGER },
@@@ -266,12 -249,12 +267,12 @@@
  		{ "push", cmd_push, RUN_SETUP },
  		{ "read-tree", cmd_read_tree, RUN_SETUP },
  		{ "reflog", cmd_reflog, RUN_SETUP },
 -		{ "repo-config", cmd_repo_config },
 +		{ "repo-config", cmd_config },
  		{ "rerere", cmd_rerere, RUN_SETUP },
  		{ "rev-list", cmd_rev_list, RUN_SETUP },
  		{ "rev-parse", cmd_rev_parse, RUN_SETUP },
 -		{ "rm", cmd_rm, RUN_SETUP },
 -		{ "runstatus", cmd_runstatus, RUN_SETUP },
 +		{ "rm", cmd_rm, RUN_SETUP | NOT_BARE },
 +		{ "runstatus", cmd_runstatus, RUN_SETUP | NOT_BARE },
  		{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
  		{ "show-branch", cmd_show_branch, RUN_SETUP },
  		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
@@@ -308,9 -291,6 +309,9 @@@
  			prefix = setup_git_directory();
  		if (p->option & USE_PAGER)
  			setup_pager();
 +		if ((p->option & NOT_BARE) &&
 +				(is_bare_repository() || is_inside_git_dir()))
 +			die("%s must be run in a work tree", cmd);
  		trace_argv_printf(argv, argc, "trace: built-in: git");
  
  		exit(p->fn(argc, argv, prefix));
@@@ -396,15 -376,8 +397,15 @@@ int main(int argc, const char **argv, c
  		done_alias = 1;
  	}
  
 -	if (errno == ENOENT)
 +	if (errno == ENOENT) {
 +		if (done_alias) {
 +			fprintf(stderr, "Expansion of alias '%s' failed; "
 +				"'%s' is not a git-command\n",
 +				cmd, argv[0]);
 +			exit(1);
 +		}
  		help_unknown_cmd(cmd);
 +	}
  
  	fprintf(stderr, "Failed to run command '%s': %s\n",
  		cmd, strerror(errno));