From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Aug 2014 18:16:25 +0000 (-0700)
Subject: Merge branch 'jk/pack-shallow-always-without-bitmap'
X-Git-Tag: v2.1.1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3d54f9a1fa481727a849b8753fc9d1abafe6583?hp=-c

Merge branch 'jk/pack-shallow-always-without-bitmap'

Reachability bitmaps do not work with shallow operations.
Fixes regression in 2.0.

* jk/pack-shallow-always-without-bitmap:
pack-objects: turn off bitmaps when we see --shallow lines
---

a3d54f9a1fa481727a849b8753fc9d1abafe6583
diff --combined builtin/pack-objects.c
index 238b5021eb,2c60ddf4a8..b59f5d895e
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -2214,6 -2214,10 +2214,6 @@@ static int git_pack_config(const char *
  		cache_max_small_delta_size = git_config_int(k, v);
  		return 0;
  	}
 -	if (!strcmp(k, "pack.writebitmaps")) {
 -		write_bitmap_index = git_config_bool(k, v);
 -		return 0;
 -	}
  	if (!strcmp(k, "pack.writebitmaphashcache")) {
  		if (git_config_bool(k, v))
  			write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
@@@ -2494,6 -2498,7 +2494,7 @@@ static void get_object_list(int ac, con
  				if (get_sha1_hex(line + 10, sha1))
  					die("not an SHA-1 '%s'", line + 10);
  				register_shallow(sha1);
+ 				use_bitmap_index = 0;
  				continue;
  			}
  			die("not a rev '%s'", line);