From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Oct 2008 20:47:22 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/20341dd970b331fd721225ca630548ec1e90d8a5?ds=inline;hp=-c

Merge branch 'maint'

* maint:
GIT 1.6.0.3
rehabilitate 'git index-pack' inside the object store
---

20341dd970b331fd721225ca630548ec1e90d8a5
diff --combined index-pack.c
index aec11cb940,c99a1a152c..6f89bb9ac7
--- a/index-pack.c
+++ b/index-pack.c
@@@ -67,7 -67,7 +67,7 @@@ static struct progress *progress
  static unsigned char input_buffer[4096];
  static unsigned int input_offset, input_len;
  static off_t consumed_bytes;
 -static SHA_CTX input_ctx;
 +static git_SHA_CTX input_ctx;
  static uint32_t input_crc32;
  static int input_fd, output_fd, pack_fd;
  
@@@ -119,7 -119,7 +119,7 @@@ static void flush(void
  	if (input_offset) {
  		if (output_fd >= 0)
  			write_or_die(output_fd, input_buffer, input_offset);
 -		SHA1_Update(&input_ctx, input_buffer, input_offset);
 +		git_SHA1_Update(&input_ctx, input_buffer, input_offset);
  		memmove(input_buffer, input_buffer + input_offset, input_len);
  		input_offset = 0;
  	}
@@@ -188,7 -188,7 +188,7 @@@ static char *open_pack_file(char *pack_
  		output_fd = -1;
  		pack_fd = input_fd;
  	}
 -	SHA1_Init(&input_ctx);
 +	git_SHA1_Init(&input_ctx);
  	return pack_name;
  }
  
@@@ -591,7 -591,7 +591,7 @@@ static void parse_pack_objects(unsigne
  
  	/* Check pack integrity */
  	flush();
 -	SHA1_Final(sha1, &input_ctx);
 +	git_SHA1_Final(sha1, &input_ctx);
  	if (hashcmp(fill(20), sha1))
  		die("pack is corrupted (SHA1 mismatch)");
  	use(20);
@@@ -790,6 -790,7 +790,6 @@@ static void final(const char *final_pac
  		err = close(output_fd);
  		if (err)
  			die("error while closing pack file: %s", strerror(errno));
 -		chmod(curr_pack_name, 0444);
  	}
  
  	if (keep_msg) {
@@@ -823,9 -824,8 +823,9 @@@
  		if (move_temp_to_file(curr_pack_name, final_pack_name))
  			die("cannot store pack file");
  	}
 +	if (from_stdin)
 +		chmod(final_pack_name, 0444);
  
 -	chmod(curr_index_name, 0444);
  	if (final_index_name != curr_index_name) {
  		if (!final_index_name) {
  			snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
@@@ -835,7 -835,6 +835,7 @@@
  		if (move_temp_to_file(curr_index_name, final_index_name))
  			die("cannot store index file");
  	}
 +	chmod(final_index_name, 0444);
  
  	if (!from_stdin) {
  		printf("%s\n", sha1_to_hex(sha1));
@@@ -880,10 -879,26 +880,26 @@@ int main(int argc, char **argv
  	char *index_name_buf = NULL, *keep_name_buf = NULL;
  	struct pack_idx_entry **idx_objects;
  	unsigned char pack_sha1[20];
- 	int nongit = 0;
  
- 	setup_git_directory_gently(&nongit);
- 	git_config(git_index_pack_config, NULL);
+ 	/*
+ 	 * We wish to read the repository's config file if any, and
+ 	 * for that it is necessary to call setup_git_directory_gently().
+ 	 * However if the cwd was inside .git/objects/pack/ then we need
+ 	 * to go back there or all the pack name arguments will be wrong.
+ 	 * And in that case we cannot rely on any prefix returned by
+ 	 * setup_git_directory_gently() either.
+ 	 */
+ 	{
+ 		char cwd[PATH_MAX+1];
+ 		int nongit;
+ 
+ 		if (!getcwd(cwd, sizeof(cwd)-1))
+ 			die("Unable to get current working directory");
+ 		setup_git_directory_gently(&nongit);
+ 		git_config(git_index_pack_config, NULL);
+ 		if (chdir(cwd))
+ 			die("Cannot come back to cwd");
+ 	}
  
  	for (i = 1; i < argc; i++) {
  		char *arg = argv[i];