Merge branch 'maint'

Junio C Hamano · Junio C Hamano · commit fa2376f3c89a · 2006-12-12T17:07:33.000-08:00
* maint:
  Clarify fetch error for missing objects.
  Move Fink and Ports check to after config file

Conflicts:

	Makefile
diff --git a/Makefile b/Makefile
@@ -326,18 +326,6 @@ ifeq ($(uname_S),Darwin)
 	NEEDS_SSL_WITH_CRYPTO = YesPlease
 	NEEDS_LIBICONV = YesPlease
 	NO_STRLCPY = YesPlease
-	ifndef NO_FINK
-		ifeq ($(shell test -d /sw/lib && echo y),y)
-			BASIC_CFLAGS += -I/sw/include
-			BASIC_LDFLAGS += -L/sw/lib
-		endif
-	endif
-	ifndef NO_DARWIN_PORTS
-		ifeq ($(shell test -d /opt/local/lib && echo y),y)
-			BASIC_CFLAGS += -I/opt/local/include
-			BASIC_LDFLAGS += -L/opt/local/lib
-		endif
-	endif
 endif
 ifeq ($(uname_S),SunOS)
 	NEEDS_SOCKET = YesPlease
@@ -415,6 +403,21 @@ endif
 -include config.mak.autogen
 -include config.mak
 
+ifeq ($(uname_S),Darwin)
+	ifndef NO_FINK
+		ifeq ($(shell test -d /sw/lib && echo y),y)
+			BASIC_CFLAGS += -I/sw/include
+			BASIC_LDFLAGS += -L/sw/lib
+		endif
+	endif
+	ifndef NO_DARWIN_PORTS
+		ifeq ($(shell test -d /opt/local/lib && echo y),y)
+			BASIC_CFLAGS += -I/opt/local/include
+			BASIC_LDFLAGS += -L/opt/local/lib
+		endif
+	endif
+endif
+
 ifndef NO_CURL
 	ifdef CURLDIR
 		# This is still problematic -- gcc does not always want -R.
diff --git a/fetch.c b/fetch.c
@@ -22,14 +22,15 @@ void pull_say(const char *fmt, const char *hex)
 		fprintf(stderr, fmt, hex);
 }
 
-static void report_missing(const char *what, const unsigned char *missing)
+static void report_missing(const struct object *obj)
 {
 	char missing_hex[41];
-
-	strcpy(missing_hex, sha1_to_hex(missing));;
-	fprintf(stderr,
-		"Cannot obtain needed %s %s\nwhile processing commit %s.\n",
-		what, missing_hex, sha1_to_hex(current_commit_sha1));
+	strcpy(missing_hex, sha1_to_hex(obj->sha1));;
+	fprintf(stderr, "Cannot obtain needed %s %s\n",
+		obj->type ? typename(obj->type): "object", missing_hex);
+	if (!is_null_sha1(current_commit_sha1))
+		fprintf(stderr, "while processing commit %s.\n",
+			sha1_to_hex(current_commit_sha1));
 }
 
 static int process(struct object *obj);
@@ -177,7 +178,7 @@ static int loop(void)
 		 */
 		if (! (obj->flags & TO_SCAN)) {
 			if (fetch(obj->sha1)) {
-				report_missing(typename(obj->type), obj->sha1);
+				report_missing(obj);
 				return -1;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,15 @@ void pull_say(const char fmt, const char hex)`
`22`	`22`	`fprintf(stderr, fmt, hex);`
`23`	`23`	`}`
`24`	`24`
`25`		`-static void report_missing(const char what, const unsigned char missing)`
	`25`	`+static void report_missing(const struct object *obj)`
`26`	`26`	`{`
`27`	`27`	`char missing_hex[41];`
`28`		`-`
`29`		`- strcpy(missing_hex, sha1_to_hex(missing));;`
`30`		`- fprintf(stderr,`
`31`		`- "Cannot obtain needed %s %s\nwhile processing commit %s.\n",`
`32`		`- what, missing_hex, sha1_to_hex(current_commit_sha1));`
	`28`	`+ strcpy(missing_hex, sha1_to_hex(obj->sha1));;`
	`29`	`+ fprintf(stderr, "Cannot obtain needed %s %s\n",`
	`30`	`+ obj->type ? typename(obj->type): "object", missing_hex);`
	`31`	`+ if (!is_null_sha1(current_commit_sha1))`
	`32`	`+ fprintf(stderr, "while processing commit %s.\n",`
	`33`	`+ sha1_to_hex(current_commit_sha1));`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`static int process(struct object *obj);`
`@@ -177,7 +178,7 @@ static int loop(void)`
`177`	`178`	`*/`
`178`	`179`	`if (! (obj->flags & TO_SCAN)) {`
`179`	`180`	`if (fetch(obj->sha1)) {`
`180`		`- report_missing(typename(obj->type), obj->sha1);`
	`181`	`+ report_missing(obj);`
`181`	`182`	`return -1;`
`182`	`183`	`}`
`183`	`184`	`}`