From 1bb914603a0f151669de2c31671f6c878c5eb79f Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 21:24:05 -0800
Subject: [PATCH 1/7] Documentation/tutorial-2: Fix interesting typo in an
 example.

Marco Candrian noticed that one cat-file example refers to a
blob object that is never used in the example sequence.

The bug is interesting in that the output from the botched
sample command is consistent with the incorrect blob object
name ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/tutorial-2.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index f48894c9a2..f363d17f0b 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -343,8 +343,8 @@ And, as you can see with cat-file, this new entry refers to the
 current contents of the file:
 
 ------------------------------------------------
-$ git cat-file blob a6b11f7a
-goodbye, word
+$ git cat-file blob 8b9743b2
+goodbye, world
 ------------------------------------------------
 
 The "status" command is a useful way to get a quick summary of the

From 026aa93818a536c819a94aae5bbefe1b6251fe0e Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 21:29:44 -0800
Subject: [PATCH 2/7] Revert "prune: --grace=time"

This reverts commit 9b088c4e394df84232cfd37aea78349a495b09c1.

Protecting 'mature' objects does not make it any safer.  We should
admit that git-prune is inherently unsafe when run in parallel with
other operations without involving unwarranted locking overhead,
and with the latest git, even rebase and reset would not immediately
create crufts anyway.
---
 Documentation/git-prune.txt |  9 +--------
 builtin-prune.c             | 31 +------------------------------
 t/t1410-reflog.sh           |  6 +++---
 t/t5400-send-pack.sh        |  4 ++--
 t/t5700-clone-reference.sh  |  4 ++--
 t/t5710-info-alternate.sh   |  6 +++---
 6 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index fbd344da40..a11e303094 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -8,7 +8,7 @@ git-prune - Prunes all unreachable objects from the object database
 
 SYNOPSIS
 --------
-'git-prune' [-n] [--grace=<time>]
+'git-prune' [-n] [--] [<head>...]
 
 DESCRIPTION
 -----------
@@ -28,12 +28,6 @@ OPTIONS
 	Do not remove anything; just report what it would
 	remove.
 
---grace=<time>::
-	Do not prune loose objects that are younger than the
-	specified time.  This gives a grace period to newly
-	created objects from getting pruned.
-
-////////////////////////////////////////////
 \--::
 	Do not interpret any more arguments as options.
 
@@ -52,7 +46,6 @@ borrows from your repository via its
 ------------
 $ git prune $(cd ../another && $(git-rev-parse --all))
 ------------
-////////////////////////////////////////////
 
 Author
 ------
diff --git a/builtin-prune.c b/builtin-prune.c
index 7929af1aac..6f0ba0d04d 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -5,9 +5,8 @@
 #include "builtin.h"
 #include "reachable.h"
 
-static const char prune_usage[] = "git-prune [-n] [--grace=time]";
+static const char prune_usage[] = "git-prune [-n]";
 static int show_only;
-static int prune_grace_period;
 
 static int prune_object(char *path, const char *filename, const unsigned char *sha1)
 {
@@ -39,7 +38,6 @@ static int prune_dir(int i, char *path)
 		char name[100];
 		unsigned char sha1[20];
 		int len = strlen(de->d_name);
-		struct stat st;
 
 		switch (len) {
 		case 2:
@@ -62,11 +60,6 @@ static int prune_dir(int i, char *path)
 			if (lookup_object(sha1))
 				continue;
 
-			if (prune_grace_period > 0 &&
-			    !stat(mkpath("%s/%s", path, de->d_name), &st) &&
-			    st.st_mtime > prune_grace_period)
-				continue;
-
 			prune_object(path, de->d_name, sha1);
 			continue;
 		}
@@ -86,25 +79,10 @@ static void prune_object_dir(const char *path)
 	}
 }
 
-static int git_prune_config(const char *var, const char *value)
-{
-	if (!strcmp(var, "gc.prunegrace")) {
-		if (!strcmp(value, "off"))
-			prune_grace_period = 0;
-		else
-			prune_grace_period = approxidate(value);
-		return 0;
-	}
-	return git_default_config(var, value);
-}
-
 int cmd_prune(int argc, const char **argv, const char *prefix)
 {
 	int i;
 	struct rev_info revs;
-	prune_grace_period = time(NULL)-24*60*60;
-
-	git_config(git_prune_config);
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -112,13 +90,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 			show_only = 1;
 			continue;
 		}
-		if (!strncmp(arg, "--grace=", 8)) {
-			if (!strcmp(arg+8, "off"))
-				prune_grace_period = 0;
-			else
-				prune_grace_period = approxidate(arg+8);
-			continue;
-		}
 		usage(prune_usage);
 	}
 
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 0c435f9574..8e8d526ef2 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -96,7 +96,7 @@ test_expect_success setup '
 
 	check_have A B C D E F G H I J K L &&
 
-	git prune --grace=off &&
+	git prune &&
 
 	check_have A B C D E F G H I J K L &&
 
@@ -115,7 +115,7 @@ test_expect_success rewind '
 
 	check_have A B C D E F G H I J K L &&
 
-	git prune --grace=off &&
+	git prune &&
 
 	check_have A B C D E F G H I J K L &&
 
@@ -160,7 +160,7 @@ test_expect_success 'reflog expire' '
 
 test_expect_success 'prune and fsck' '
 
-	git prune --grace=off &&
+	git prune &&
 	check_fsck &&
 
 	check_have A B C D E H L &&
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 2a55d5ae32..2c151912a3 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -55,13 +55,13 @@ test_expect_success setup '
 
 test_expect_success 'pack the source repository' '
 	git repack -a -d &&
-	git prune --grace=off
+	git prune
 '
 
 test_expect_success 'pack the destination repository' '
 	cd victim &&
 	git repack -a -d &&
-	git prune --grace=off &&
+	git prune &&
 	cd ..
 '
 
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index ab00e8fb6a..dd9caad1c2 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -22,7 +22,7 @@ echo second > file2 &&
 git add file2 &&
 git commit -m addition &&
 git repack -a -d &&
-git prune --grace=off'
+git prune'
 
 cd "$base_dir"
 
@@ -56,7 +56,7 @@ echo third > file3 &&
 git add file3 &&
 git commit -m update &&
 git repack -a -d &&
-git prune --grace=off'
+git prune'
 
 cd "$base_dir"
 
diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh
index c30fee81f5..b9f6d96363 100755
--- a/t/t5710-info-alternate.sh
+++ b/t/t5710-info-alternate.sh
@@ -29,7 +29,7 @@ echo "Hello World" > file1 &&
 git add file1 &&
 git commit -m "Initial commit" file1 &&
 git repack -a -d &&
-git prune --grace=off'
+git prune'
 
 cd "$base_dir"
 
@@ -39,7 +39,7 @@ echo "foo bar" > file2 &&
 git add file2 &&
 git commit -m "next commit" file2 &&
 git repack -a -d -l &&
-git prune --grace=off'
+git prune'
 
 cd "$base_dir"
 
@@ -49,7 +49,7 @@ echo "Goodbye, cruel world" > file3 &&
 git add file3 &&
 git commit -m "one more" file3 &&
 git repack -a -d -l &&
-git prune --grace=off'
+git prune'
 
 cd "$base_dir"
 

From ec587fde0a76780931c7ac32474c8c000aa45134 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 17:10:51 -0800
Subject: [PATCH 3/7] Make sure git_connect() always give two file descriptors.

Earlier, git_connect() returned the same fd twice or two
separate fds, depending on the way the connection was made (when
we are talking to the other end over a single socket, we used
the same fd twice, and when our end is connected to a pipepair
we used two).

This forced callers who do close() and dup() to really care
which was which, and most of the existing callers got this
wrong, although without much visible ill effect.  Many were
closing the same fd twice when we are talking over a single
socket, and one was leaking a fd.

This fixes it to uniformly use two separate fds, so if somebody
wants to close only reader side can just do close() on it
without worrying about it accidentally also closing the writer
side or vice versa.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 builtin-archive.c | 1 +
 connect.c         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/builtin-archive.c b/builtin-archive.c
index 32737d3162..f613ac2516 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -74,6 +74,7 @@ static int run_remote_archiver(const char *remote, int argc,
 	/* Now, start reading from fd[0] and spit it out to stdout */
 	rv = recv_sideband("archive", fd[0], 1, 2);
 	close(fd[0]);
+	close(fd[1]);
 	rv |= finish_connect(pid);
 
 	return !!rv;
diff --git a/connect.c b/connect.c
index 66daa11a57..78448889da 100644
--- a/connect.c
+++ b/connect.c
@@ -529,7 +529,7 @@ static void git_tcp_connect(int fd[2], char *host)
 	int sockfd = git_tcp_connect_sock(host);
 
 	fd[0] = sockfd;
-	fd[1] = sockfd;
+	fd[1] = dup(sockfd);
 }
 
 

From f43117a6c134f3b7873983eae0df1cc14b270ff1 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 22:22:23 -0800
Subject: [PATCH 4/7] is_repository_shallow(): prototype fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 commit.h  | 2 +-
 shallow.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/commit.h b/commit.h
index 936f8fce30..491b0c4aac 100644
--- a/commit.h
+++ b/commit.h
@@ -110,7 +110,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
 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);
 
diff --git a/shallow.c b/shallow.c
index 3d53d17423..d17868929c 100644
--- a/shallow.c
+++ b/shallow.c
@@ -17,7 +17,7 @@ int register_shallow(const unsigned char *sha1)
 	return register_commit_graft(graft, 0);
 }
 
-int is_repository_shallow()
+int is_repository_shallow(void)
 {
 	FILE *fp;
 	char buf[1024];

From a0022eebf345a4515c7d148c303911010b1fa834 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 22:23:58 -0800
Subject: [PATCH 5/7] shallow repository: disable unsupported operations for
 now.

We currently do not support fetching/cloning from a shallow repository
nor pushing into one.  Make sure these are not attempted so that we
do not have to worry about corrupting repositories needlessly.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 receive-pack.c | 3 +++
 upload-pack.c  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/receive-pack.c b/receive-pack.c
index c176d8fd00..6333f00c6e 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -421,6 +421,9 @@ int main(int argc, char **argv)
 	if (!enter_repo(dir, 0))
 		die("'%s': unable to chdir or not a git archive", dir);
 
+	if (is_repository_shallow())
+		die("attempt to push into a shallow repository");
+
 	setup_ident();
 	/* don't die if gecos is empty */
 	ignore_missing_committer_name();
diff --git a/upload-pack.c b/upload-pack.c
index 3a466c6a3e..3648aae1a7 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -672,7 +672,8 @@ int main(int argc, char **argv)
 
 	if (!enter_repo(dir, strict))
 		die("'%s': unable to chdir or not a git archive", dir);
-
+	if (is_repository_shallow())
+		die("attempt to fetch/clone from a shallow repository");
 	upload_pack();
 	return 0;
 }

From e3ff4b244726f89620201e3295f097cf00b6b502 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Jan 2007 23:28:28 -0800
Subject: [PATCH 6/7] git-gc: do not run git-prune by default.

git-prune is not safe when run uncontrolled in parallel while
other git operations are creating new objects.  To avoid
mistakes, do not run git-prune by default from git-gc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/git-gc.txt | 17 ++++++++++++++++-
 git-gc.sh                | 18 ++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 2bcc9491a3..e37758ad15 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
 
 SYNOPSIS
 --------
-'git-gc'
+'git-gc' [--prune]
 
 DESCRIPTION
 -----------
@@ -21,6 +21,21 @@ Users are encouraged to run this task on a regular basis within
 each repository to maintain good disk space utilization and good
 operating performance.
 
+OPTIONS
+-------
+
+--prune::
+	Usually `git-gc` packs refs, expires old reflog entries,
+	packs loose objects,
+	and removes old 'rerere' records.  Removal
+	of unreferenced loose objects is an unsafe operation
+	while other git operations are in progress, so it is not
+	done by default.  Pass this option if you want it, and only
+	when you know nobody else is creating new objects in the
+	repository at the same time (e.g. never use this option
+	in a cron script).
+
+
 Configuration
 -------------
 
diff --git a/git-gc.sh b/git-gc.sh
index 6de55f7292..3e8c87c814 100755
--- a/git-gc.sh
+++ b/git-gc.sh
@@ -4,12 +4,26 @@
 #
 # Cleanup unreachable files and optimize the repository.
 
-USAGE=''
+USAGE='git-gc [--prune]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 
+no_prune=:
+while case $# in 0) break ;; esac
+do
+	case "$1" in
+	--prune)
+		no_prune=
+		;;
+	--)
+		usage
+		;;
+	esac
+	shift
+done
+
 git-pack-refs --prune &&
 git-reflog expire --all &&
 git-repack -a -d -l &&
-git-prune &&
+$no_prune git-prune &&
 git-rerere gc || exit

From 18af29f247f79b6fb61335f98a21daea67f5632f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@osdl.org>
Date: Sun, 21 Jan 2007 22:26:41 -0800
Subject: [PATCH 7/7] fsck-objects: refactor checking for connectivity

This separates the connectivity check into separate codepaths,
one for reachable objects and the other for unreachable ones,
while adding a lot of comments to explain what is going on.

When checking an unreachable object, unlike a reachable one, we
do not have to complain if it does not exist (we used to
complain about a missing blob even when the only thing that
references it is a tree that is dangling).  Also we do not have
to check and complain about objects that are referenced by an
unreachable object.

This makes the messages from fsck-objects a lot less noisy and
more useful.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 fsck-objects.c | 133 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 95 insertions(+), 38 deletions(-)

diff --git a/fsck-objects.c b/fsck-objects.c
index 81f00db90b..ecfb014fff 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -54,6 +54,99 @@ static int objwarning(struct object *obj, const char *err, ...)
 	return -1;
 }
 
+/*
+ * Check a single reachable object
+ */
+static void check_reachable_object(struct object *obj)
+{
+	const struct object_refs *refs;
+
+	/*
+	 * We obviously want the object to be parsed,
+	 * except if it was in a pack-file and we didn't
+	 * do a full fsck
+	 */
+	if (!obj->parsed) {
+		if (has_sha1_file(obj->sha1))
+			return; /* it is in pack - forget about it */
+		printf("missing %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1));
+		return;
+	}
+
+	/*
+	 * Check that everything that we try to reference is also good.
+	 */
+	refs = lookup_object_refs(obj);
+	if (refs) {
+		unsigned j;
+		for (j = 0; j < refs->count; j++) {
+			struct object *ref = refs->ref[j];
+			if (ref->parsed ||
+			    (has_sha1_file(ref->sha1)))
+				continue;
+			printf("broken link from %7s %s\n",
+			       typename(obj->type), sha1_to_hex(obj->sha1));
+			printf("              to %7s %s\n",
+			       typename(ref->type), sha1_to_hex(ref->sha1));
+		}
+	}
+}
+
+/*
+ * Check a single unreachable object
+ */
+static void check_unreachable_object(struct object *obj)
+{
+	/*
+	 * Missing unreachable object? Ignore it. It's not like
+	 * we miss it (since it can't be reached), nor do we want
+	 * to complain about it being unreachable (since it does
+	 * not exist).
+	 */
+	if (!obj->parsed)
+		return;
+
+	/*
+	 * Unreachable object that exists? Show it if asked to,
+	 * since this is something that is prunable.
+	 */
+	if (show_unreachable) {
+		printf("unreachable %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1));
+		return;
+	}
+
+	/*
+	 * "!used" means that nothing at all points to it, including
+	 * other unreacahble objects. In other words, it's the "tip"
+	 * of some set of unreachable objects, usually a commit that
+	 * got dropped.
+	 *
+	 * Such starting points are more interesting than some random
+	 * set of unreachable objects, so we show them even if the user
+	 * hasn't asked for _all_ unreachable objects. If you have
+	 * deleted a branch by mistake, this is a prime candidate to
+	 * start looking at, for example.
+	 */
+	if (!obj->used) {
+		printf("dangling %s %s\n", typename(obj->type),
+		       sha1_to_hex(obj->sha1));
+		return;
+	}
+
+	/*
+	 * Otherwise? It's there, it's unreachable, and some other unreachable
+	 * object points to it. Ignore it - it's not interesting, and we showed
+	 * all the interesting cases above.
+	 */
+}
+
+static void check_object(struct object *obj)
+{
+	if (obj->flags & REACHABLE)
+		check_reachable_object(obj);
+	else
+		check_unreachable_object(obj);
+}
 
 static void check_connectivity(void)
 {
@@ -62,46 +155,10 @@ static void check_connectivity(void)
 	/* Look up all the requirements, warn about missing objects.. */
 	max = get_max_object_index();
 	for (i = 0; i < max; i++) {
-		const struct object_refs *refs;
 		struct object *obj = get_indexed_object(i);
 
-		if (!obj)
-			continue;
-
-		if (!obj->parsed) {
-			if (has_sha1_file(obj->sha1))
-				; /* it is in pack */
-			else
-				printf("missing %s %s\n",
-				       typename(obj->type), sha1_to_hex(obj->sha1));
-			continue;
-		}
-
-		refs = lookup_object_refs(obj);
-		if (refs) {
-			unsigned j;
-			for (j = 0; j < refs->count; j++) {
-				struct object *ref = refs->ref[j];
-				if (ref->parsed ||
-				    (has_sha1_file(ref->sha1)))
-					continue;
-				printf("broken link from %7s %s\n",
-				       typename(obj->type), sha1_to_hex(obj->sha1));
-				printf("              to %7s %s\n",
-				       typename(ref->type), sha1_to_hex(ref->sha1));
-			}
-		}
-
-		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			printf("unreachable %s %s\n",
-			       typename(obj->type), sha1_to_hex(obj->sha1));
-			continue;
-		}
-
-		if (!obj->used) {
-			printf("dangling %s %s\n", typename(obj->type),
-			       sha1_to_hex(obj->sha1));
-		}
+		if (obj)
+			check_object(obj);
 	}
 }
 
