From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:25 +0000 (-0800)
Subject: Merge branch 'jk/repository-extension' into maint
X-Git-Tag: v2.6.3~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f89baca1b99ff2882690d6b58dc2071195c6ae84;p=thirdparty%2Fgit.git

Merge branch 'jk/repository-extension' into maint

Prepare for Git on-disk repository representation to undergo
backward incompatible changes by introducing a new repository
format version "1", with an extension mechanism.

* jk/repository-extension:
  introduce "preciousObjects" repository extension
  introduce "extensions" form of core.repositoryformatversion
---

f89baca1b99ff2882690d6b58dc2071195c6ae84
diff --cc builtin/prune.c
index 10b03d3e4c,6a58e75108..8f4f052285
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@@ -119,6 -211,16 +119,9 @@@ int cmd_prune(int argc, const char **ar
  
  	argc = parse_options(argc, argv, prefix, options, prune_usage, 0);
  
 -	if (do_prune_worktrees) {
 -		if (argc)
 -			die(_("--worktrees does not take extra arguments"));
 -		prune_worktrees();
 -		return 0;
 -	}
 -
+ 	if (repository_format_precious_objects)
+ 		die(_("cannot prune in a precious-objects repo"));
+ 
  	while (argc--) {
  		unsigned char sha1[20];
  		const char *name = *argv++;