Merge branch 'jn/send-pack-error' into maint

gitster · gitster · commit d2a99221a768 · 2010-11-24T12:46:46.000-08:00
* jn/send-pack-error:
  send-pack: avoid redundant "pack-objects died with strange error"
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
@@ -101,7 +101,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
 	}
 
 	if (finish_command(&po))
-		return error("pack-objects died with strange error");
+		return -1;
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ static int pack_objects(int fd, struct ref refs, struct extra_have_objects ext`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if (finish_command(&po))`
`104`		`- return error("pack-objects died with strange error");`
	`104`	`+ return -1;`
`105`	`105`	`return 0;`
`106`	`106`	`}`
`107`	`107`