summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-21 14:41:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-21 14:41:44 -0700
commitcf5c75d3ea0541bf7fe8ef89938f54a491edc023 (patch)
tree59fcbebaa8375645bd67dc18065331ac7455b3d6
parentKick off post 1.7.11 cycle (diff)
parenttweak "bundle verify" of a complete history (diff)
downloadtgif-cf5c75d3ea0541bf7fe8ef89938f54a491edc023.tar.xz
Merge branch 'jc/bundle-complete-notice'
Running "git bundle verify" on a bundle that records a complete history said "it requires these 0 commits". * jc/bundle-complete-notice: tweak "bundle verify" of a complete history
-rw-r--r--bundle.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/bundle.c b/bundle.c
index 8d31b98f58..8d12816b9d 100644
--- a/bundle.c
+++ b/bundle.c
@@ -188,12 +188,16 @@ int verify_bundle(struct bundle_header *header, int verbose)
r->nr),
r->nr);
list_refs(r, 0, NULL);
- r = &header->prerequisites;
- printf_ln(Q_("The bundle requires this ref",
- "The bundle requires these %d refs",
- r->nr),
- r->nr);
- list_refs(r, 0, NULL);
+ if (!r->nr) {
+ printf_ln(_("The bundle records a complete history."));
+ } else {
+ r = &header->prerequisites;
+ printf_ln(Q_("The bundle requires this ref",
+ "The bundle requires these %d refs",
+ r->nr),
+ r->nr);
+ list_refs(r, 0, NULL);
+ }
}
return ret;
}