aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-rev-list.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-21 17:19:25 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-21 17:19:25 -0700
commite660e11b202f12d15cfe8089909a307b1900c03a (patch)
tree7717a73e5920d4e3a5482391e5e290a220ba2d6b /builtin-rev-list.c
parente8760cde01299817daae26c9ad074b776bbd8f88 (diff)
parentb9849a1ab63143c3b70e339491a897ef62a4173b (diff)
downloadgit-e660e11b202f12d15cfe8089909a307b1900c03a.tar.gz
Merge branch 'jc/quickfetch'
* jc/quickfetch: Make sure quickfetch is not fooled with a previous, incomplete fetch. git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate git-fetch--tool pick-rref
Diffstat (limited to 'builtin-rev-list.c')
-rw-r--r--builtin-rev-list.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 09774f9559..c0329dcecd 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -113,6 +113,10 @@ static void show_object(struct object_array_entry *p)
* confuse downstream git-pack-objects very badly.
*/
const char *ep = strchr(p->name, '\n');
+
+ if (p->item->type == OBJ_BLOB && !has_sha1_file(p->item->sha1))
+ die("missing blob object '%s'", sha1_to_hex(p->item->sha1));
+
if (ep) {
printf("%s %.*s\n", sha1_to_hex(p->item->sha1),
(int) (ep - p->name),