From: Junio C Hamano <junkio@cox.net>
Date: Thu, 21 Sep 2006 07:40:28 +0000 (-0700)
Subject: Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
X-Git-Tag: v1.4.4-rc1~43^2~19^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eaf12a8c7d844be947c29954b658c17996abcd25?ds=inline;hp=-c

Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs

* lt/refs: (58 commits)
git-pack-refs --prune
pack-refs: do not pack symbolic refs.
Tell between packed, unpacked and symbolic refs.
Add callback data to for_each_ref() family.
symbolit-ref: fix resolve_ref conversion.
Fix broken sha1 locking
fsck-objects: adjust to resolve_ref() clean-up.
gitignore: git-pack-refs is a generated file.
wt-status: use simplified resolve_ref to find current branch
Fix t1400-update-ref test minimally
Enable the packed refs file format
Make ref resolution saner
Add support for negative refs
Start handling references internally as a sorted in-memory list
gitweb fix validating pg (page) parameter
git-repack(1): document --window and --depth
git-apply(1): document --unidiff-zero
gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
upload-archive: monitor child communication even more carefully.
gitweb: export options
...
---

eaf12a8c7d844be947c29954b658c17996abcd25
diff --combined .gitignore
index f53e0b247c,1ff28c7c56..6ca371ae16
--- a/.gitignore
+++ b/.gitignore
@@@ -8,6 -8,7 +8,7 @@@ git-appl
  git-applymbox
  git-applypatch
  git-archimport
+ git-archive
  git-bisect
  git-branch
  git-cat-file
@@@ -72,6 -73,7 +73,7 @@@ git-name-re
  git-mv
  git-pack-redundant
  git-pack-objects
+ git-pack-refs
  git-parse-remote
  git-patch-id
  git-peek-remote
@@@ -94,6 -96,7 +96,7 @@@ git-rev-lis
  git-rev-parse
  git-revert
  git-rm
+ git-runstatus
  git-send-email
  git-send-pack
  git-sh-setup
@@@ -102,7 -105,6 +105,7 @@@ git-shortlo
  git-show
  git-show-branch
  git-show-index
 +git-show-ref
  git-ssh-fetch
  git-ssh-pull
  git-ssh-push
@@@ -119,6 -121,7 +122,7 @@@ git-unpack-object
  git-update-index
  git-update-ref
  git-update-server-info
+ git-upload-archive
  git-upload-pack
  git-upload-tar
  git-var
diff --combined Makefile
index c3651384c2,cdbb566d4e..563b921d92
--- a/Makefile
+++ b/Makefile
@@@ -126,6 -126,8 +126,8 @@@ GITWEB_CONFIG = gitweb_config.per
  GITWEB_HOME_LINK_STR = projects
  GITWEB_SITENAME =
  GITWEB_PROJECTROOT = /pub/git
+ GITWEB_EXPORT_OK =
+ GITWEB_STRICT_EXPORT =
  GITWEB_BASE_URL =
  GITWEB_LIST =
  GITWEB_HOMETEXT = indextext.html
@@@ -232,8 -234,8 +234,8 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
- 	blob.h cache.h commit.h csum-file.h delta.h \
- 	diff.h object.h pack.h pkt-line.h quote.h refs.h \
+ 	archive.h blob.h cache.h commit.h csum-file.h delta.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
  
@@@ -245,17 -247,19 +247,19 @@@ DIFF_OBJS = 
  LIB_OBJS = \
  	blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \
- 	object.o pack-check.o patch-delta.o path.o pkt-line.o \
+ 	object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.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 \
  	fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
- 	write_or_die.o trace.o \
- 	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS)
+ 	write_or_die.o trace.o list-objects.o \
+ 	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
+ 	color.o wt-status.o
  
  BUILTIN_OBJS = \
  	builtin-add.o \
  	builtin-apply.o \
+ 	builtin-archive.o \
  	builtin-cat-file.o \
  	builtin-checkout-index.o \
  	builtin-check-ref-format.o \
@@@ -285,6 -289,7 +289,7 @@@
  	builtin-rev-list.o \
  	builtin-rev-parse.o \
  	builtin-rm.o \
+ 	builtin-runstatus.o \
  	builtin-show-branch.o \
  	builtin-stripspace.o \
  	builtin-symbolic-ref.o \
@@@ -292,11 -297,12 +297,13 @@@
  	builtin-unpack-objects.o \
  	builtin-update-index.o \
  	builtin-update-ref.o \
+ 	builtin-upload-archive.o \
  	builtin-upload-tar.o \
  	builtin-verify-pack.o \
  	builtin-write-tree.o \
  	builtin-zip-tree.o \
- 	builtin-show-ref.o
++	builtin-show-ref.o \
+ 	builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -632,6 -638,8 +639,8 @@@ gitweb/gitweb.cgi: gitweb/gitweb.per
  	    -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
  	    -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
  	    -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
+ 	    -e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
+ 	    -e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
  	    -e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
  	    -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
  	    -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
diff --combined builtin-show-ref.c
index fab359bb42,0000000000..12c457c3c1
mode 100644,000000..100644
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@@ -1,120 -1,0 +1,120 @@@
 +#include "cache.h"
 +#include "refs.h"
 +#include "object.h"
 +#include "tag.h"
 +
 +static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash] [--tags] [--heads] [--] [pattern*]";
 +
 +static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,
 +	found_match = 0, verify = 0, quiet = 0, hash_only = 0;
 +static const char **pattern;
 +
- static int show_ref(const char *refname, const unsigned char *sha1)
++static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 +{
 +	struct object *obj;
 +
 +	if (tags_only || heads_only) {
 +		int match;
 +
 +		match = heads_only && !strncmp(refname, "refs/heads/", 11);
 +		match |= tags_only && !strncmp(refname, "refs/tags/", 10);
 +		if (!match)
 +			return 0;
 +	}
 +	if (pattern) {
 +		int reflen = strlen(refname);
 +		const char **p = pattern, *m;
 +		while ((m = *p++) != NULL) {
 +			int len = strlen(m);
 +			if (len > reflen)
 +				continue;
 +			if (memcmp(m, refname + reflen - len, len))
 +				continue;
 +			if (len == reflen)
 +				goto match;
 +			/* "--verify" requires an exact match */
 +			if (verify)
 +				continue;
 +			if (refname[reflen - len - 1] == '/')
 +				goto match;
 +		}
 +		return 0;
 +	}
 +
 +match:
 +	found_match++;
 +	obj = parse_object(sha1);
 +	if (!obj) {
 +		if (quiet)
 +			return 0;
 +		die("git-show-ref: bad ref %s (%s)", refname, sha1_to_hex(sha1));
 +	}
 +	if (quiet)
 +		return 0;
 +	if (hash_only)
 +		printf("%s\n", sha1_to_hex(sha1));
 +	else
 +		printf("%s %s\n", sha1_to_hex(sha1), refname);
 +	if (deref_tags && obj->type == OBJ_TAG) {
 +		obj = deref_tag(obj, refname, 0);
 +		printf("%s %s^{}\n", sha1_to_hex(obj->sha1), refname);
 +	}
 +	return 0;
 +}
 +
 +int cmd_show_ref(int argc, const char **argv, const char *prefix)
 +{
 +	int i;
 +
 +	for (i = 1; i < argc; i++) {
 +		const char *arg = argv[i];
 +		if (*arg != '-') {
 +			pattern = argv + i;
 +			break;
 +		}
 +		if (!strcmp(arg, "--")) {
 +			pattern = argv + i + 1;
 +			if (!*pattern)
 +				pattern = NULL;
 +			break;
 +		}
 +		if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet")) {
 +			quiet = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "-h") || !strcmp(arg, "--head")) {
 +			show_head = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "-d") || !strcmp(arg, "--dereference")) {
 +			deref_tags = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "-s") || !strcmp(arg, "--hash")) {
 +			hash_only = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "--verify")) {
 +			verify = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "--tags")) {
 +			tags_only = 1;
 +			continue;
 +		}
 +		if (!strcmp(arg, "--heads")) {
 +			heads_only = 1;
 +			continue;
 +		}
 +		usage(show_ref_usage);
 +	}
 +	if (show_head)
- 		head_ref(show_ref);
- 	for_each_ref(show_ref);
++		head_ref(show_ref, NULL);
++	for_each_ref(show_ref, NULL);
 +	if (!found_match) {
 +		if (verify && !quiet)
 +			die("No match");
 +		return 1;
 +	}
 +	return 0;
 +}
diff --combined builtin.h
index a7242beebb,4b11f52f1d..37c2e4ac43
--- a/builtin.h
+++ b/builtin.h
@@@ -14,6 -14,7 +14,7 @@@ extern int write_tree(unsigned char *sh
  
  extern int cmd_add(int argc, const char **argv, const char *prefix);
  extern int cmd_apply(int argc, const char **argv, const char *prefix);
+ extern int cmd_archive(int argc, const char **argv, const char *prefix);
  extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
  extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
  extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
@@@ -46,6 -47,7 +47,7 @@@ extern int cmd_repo_config(int argc, co
  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);
  extern int cmd_rm(int argc, const char **argv, const char *prefix);
+ extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
  extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_show(int argc, const char **argv, const char *prefix);
  extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
@@@ -55,11 -57,12 +57,13 @@@ extern int cmd_zip_tree(int argc, cons
  extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
  extern int cmd_update_index(int argc, const char **argv, const char *prefix);
  extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
+ extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
  extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
  extern int cmd_version(int argc, const char **argv, const char *prefix);
  extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
  extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
 +extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
+ extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
  
  #endif
diff --combined git.c
index fedd53683e,de2a06b973..9afb94d790
--- a/git.c
+++ b/git.c
@@@ -220,6 -220,7 +220,7 @@@ static void handle_internal_command(in
  	} commands[] = {
  		{ "add", cmd_add, RUN_SETUP },
  		{ "apply", cmd_apply },
+ 		{ "archive", cmd_archive },
  		{ "cat-file", cmd_cat_file, RUN_SETUP },
  		{ "checkout-index", cmd_checkout_index, RUN_SETUP },
  		{ "check-ref-format", cmd_check_ref_format },
@@@ -252,6 -253,7 +253,7 @@@
  		{ "rev-list", cmd_rev_list, RUN_SETUP },
  		{ "rev-parse", cmd_rev_parse, RUN_SETUP },
  		{ "rm", cmd_rm, RUN_SETUP },
+ 		{ "runstatus", cmd_runstatus, RUN_SETUP },
  		{ "show-branch", cmd_show_branch, RUN_SETUP },
  		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
  		{ "stripspace", cmd_stripspace },
@@@ -261,12 -263,13 +263,14 @@@
  		{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
  		{ "update-index", cmd_update_index, RUN_SETUP },
  		{ "update-ref", cmd_update_ref, RUN_SETUP },
+ 		{ "upload-archive", cmd_upload_archive },
  		{ "upload-tar", cmd_upload_tar },
  		{ "version", cmd_version },
  		{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
  		{ "write-tree", cmd_write_tree, RUN_SETUP },
  		{ "verify-pack", cmd_verify_pack },
 +		{ "show-ref", cmd_show_ref, RUN_SETUP },
+ 		{ "pack-refs", cmd_pack_refs, RUN_SETUP },
  	};
  	int i;