From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Apr 2007 02:33:38 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2de00bf9e8815970c61cefaef35efeacd8a7d6de?ds=inline;hp=-c

Merge branch 'maint'

* maint:
fix up strtoul_ui error handling
git-tar-tree: complete deprecation conversion message
---

2de00bf9e8815970c61cefaef35efeacd8a7d6de
diff --combined builtin-update-index.c
index b3d4acee6d,8659800eec..e5541df284
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@@ -60,7 -60,7 +60,7 @@@ static int mark_valid(const char *path
  	return -1;
  }
  
 -static int add_file_to_cache(const char *path)
 +static int process_file(const char *path)
  {
  	int size, namelen, option, status;
  	struct cache_entry *ce;
@@@ -210,7 -210,7 +210,7 @@@ static void update_one(const char *path
  		report("remove '%s'", path);
  		goto free_return;
  	}
 -	if (add_file_to_cache(p))
 +	if (process_file(p))
  		die("Unable to process file %s", path);
  	report("add '%s'", path);
   free_return:
@@@ -499,7 -499,7 +499,7 @@@ int cmd_update_index(int argc, const ch
  	/* We can't free this memory, it becomes part of a linked list parsed atexit() */
  	lock_file = xcalloc(1, sizeof(struct lock_file));
  
 -	newfd = hold_lock_file_for_update(lock_file, get_index_file(), 0);
 +	newfd = hold_locked_index(lock_file, 0);
  	if (newfd < 0)
  		lock_error = errno;
  
@@@ -551,7 -551,7 +551,7 @@@
  				if (i+3 >= argc)
  					die("git-update-index: --cacheinfo <mode> <sha1> <path>");
  
- 				if ((strtoul_ui(argv[i+1], 8, &mode) != 1) ||
+ 				if (strtoul_ui(argv[i+1], 8, &mode) ||
  				    get_sha1_hex(argv[i+2], sha1) ||
  				    add_cacheinfo(mode, sha1, argv[i+3], 0))
  					die("git-update-index: --cacheinfo"
@@@ -665,7 -665,7 +665,7 @@@
  			    get_index_file(), strerror(lock_error));
  		}
  		if (write_cache(newfd, active_cache, active_nr) ||
 -		    close(newfd) || commit_lock_file(lock_file))
 +		    close(newfd) || commit_locked_index(lock_file))
  			die("Unable to write new index file");
  	}