Merge branch 'sv/objfixes'

gitster · gitster · commit d44c782bbd6b · 2007-06-06T15:43:24.000-07:00
* sv/objfixes:
  Don't assume tree entries that are not dirs are blobs
  git-cvsimport: Make sure to use $git_dir always instead of .git sometimes
  fix documentation of unpack-objects -n
  Accept dates before 2000/01/01 when specified as seconds since the epoch
diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
@@ -27,8 +27,8 @@ new packs and replace existing ones.
 OPTIONS
 -------
 -n::
-        Only list the objects that would be unpacked, don't actually unpack
-        them.
+        Dry run.  Check the pack file without actually unpacking
+	the objects.
 
 -q::
 	The command usually shows percentage progress.  This
diff --git a/date.c b/date.c
@@ -414,9 +414,11 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
 	num = strtoul(date, &end, 10);
 
 	/*
-	 * Seconds since 1970? We trigger on that for anything after Jan 1, 2000
+	 * Seconds since 1970? We trigger on that for any numbers with
+	 * more than 8 digits. This is because we don't want to rule out
+	 * numbers like 20070606 as a YYYYMMDD date.
 	 */
-	if (num > 946684800) {
+	if (num >= 100000000) {
 		time_t time = num;
 		if (gmtime_r(&time, tm)) {
 			*tm_gmt = 1;
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
@@ -692,8 +692,8 @@ sub commit {
 	if ($branch eq $opt_o && !$index{branch} && !get_headref($branch, $git_dir)) {
 	    # looks like an initial commit
 	    # use the index primed by git-init
-	    $ENV{GIT_INDEX_FILE} = '.git/index';
-	    $index{$branch} = '.git/index';
+	    $ENV{GIT_INDEX_FILE} = "$git_dir/index";
+	    $index{$branch} = "$git_dir/index";
 	} else {
 	    # use an index per branch to speed up
 	    # imports of projects with many branches
@@ -984,7 +984,7 @@ sub commit {
 }
 
 foreach my $git_index (values %index) {
-    if ($git_index ne '.git/index') {
+    if ($git_index ne "$git_dir/index") {
 	unlink($git_index);
     }
 }
diff --git a/object.c b/object.c
@@ -160,8 +160,11 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
 		parse_tag_buffer(tag, buffer, size);
 		obj = &tag->object;
 	} else {
+		warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type);
 		obj = NULL;
 	}
+	if (obj && obj->type == OBJ_NONE)
+		obj->type = type;
 	*eaten_p = eaten;
 	return obj;
 }
diff --git a/tree.c b/tree.c
@@ -173,8 +173,13 @@ static void track_tree_refs(struct tree *item)
 			continue;
 		if (S_ISDIR(entry.mode))
 			obj = &lookup_tree(entry.sha1)->object;
-		else
+		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
 			obj = &lookup_blob(entry.sha1)->object;
+		else {
+			warning("in tree %s: entry %s has bad mode %.6o\n",
+			     sha1_to_hex(item->object.sha1), entry.path, entry.mode);
+			obj = lookup_unknown_object(entry.sha1);
+		}
 		refs->ref[i++] = obj;
 	}
 	set_object_refs(&item->object, refs);

Original file line number	Diff line number	Diff line change
`@@ -692,8 +692,8 @@ sub commit {`
`692`	`692`	`if ($branch eq $opt_o && !$index{branch} && !get_headref($branch, $git_dir)) {`
`693`	`693`	`# looks like an initial commit`
`694`	`694`	`# use the index primed by git-init`
`695`		`- $ENV{GIT_INDEX_FILE} = '.git/index';`
`696`		`- $index{$branch} = '.git/index';`
	`695`	`+ $ENV{GIT_INDEX_FILE} = "$git_dir/index";`
	`696`	`+ $index{$branch} = "$git_dir/index";`
`697`	`697`	`} else {`
`698`	`698`	`# use an index per branch to speed up`
`699`	`699`	`# imports of projects with many branches`
`@@ -984,7 +984,7 @@ sub commit {`
`984`	`984`	`}`
`985`	`985`
`986`	`986`	`foreach my $git_index (values %index) {`
`987`		`- if ($git_index ne '.git/index') {`
	`987`	`+ if ($git_index ne "$git_dir/index") {`
`988`	`988`	`unlink($git_index);`
`989`	`989`	`}`
`990`	`990`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,11 @@ struct object parse_object_buffer(const unsigned char sha1, enum object_type t`
`160`	`160`	`parse_tag_buffer(tag, buffer, size);`
`161`	`161`	`obj = &tag->object;`
`162`	`162`	`} else {`
	`163`	`+ warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type);`
`163`	`164`	`obj = NULL;`
`164`	`165`	`}`
	`166`	`+ if (obj && obj->type == OBJ_NONE)`
	`167`	`+ obj->type = type;`
`165`	`168`	`*eaten_p = eaten;`
`166`	`169`	`return obj;`
`167`	`170`	`}`