From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Nov 2009 07:55:50 +0000 (-0800)
Subject: Merge branch 'jc/fix-tree-walk' (early part)
X-Git-Tag: v1.6.6-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39add7a36feca434ba85267cb76e4fd69bcdc13a?ds=inline;hp=-c

Merge branch 'jc/fix-tree-walk' (early part)

* 'jc/fix-tree-walk' (early part):
unpack_callback(): use unpack_failed() consistently
unpack-trees: typofix
diff-lib.c: fix misleading comments on oneway_diff()
---

39add7a36feca434ba85267cb76e4fd69bcdc13a
diff --combined unpack-trees.c
index 157d5d001f,c424bab409..dd5999c356
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -277,6 -277,17 +277,17 @@@ static int unpack_nondirectories(int n
  	return 0;
  }
  
+ static int unpack_failed(struct unpack_trees_options *o, const char *message)
+ {
+ 	discard_index(&o->result);
+ 	if (!o->gently) {
+ 		if (message)
+ 			return error("%s", message);
+ 		return -1;
+ 	}
+ 	return -1;
+ }
+ 
  static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
  {
  	struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
@@@ -294,7 -305,7 +305,7 @@@
  			int cmp = compare_entry(ce, info, p);
  			if (cmp < 0) {
  				if (unpack_index_entry(ce, o) < 0)
- 					return -1;
+ 					return unpack_failed(o, NULL);
  				continue;
  			}
  			if (!cmp) {
@@@ -352,17 -363,6 +363,6 @@@
  	return mask;
  }
  
- static int unpack_failed(struct unpack_trees_options *o, const char *message)
- {
- 	discard_index(&o->result);
- 	if (!o->gently) {
- 		if (message)
- 			return error("%s", message);
- 		return -1;
- 	}
- 	return -1;
- }
- 
  /*
   * N-way merge "len" trees.  Returns 0 on success, -1 on failure to manipulate the
   * resulting index, -2 on failure to reflect the changes to the work tree.
@@@ -617,7 -617,7 +617,7 @@@ static int verify_absent(struct cache_e
  			 * found "foo/." in the working tree.
  			 * This is tricky -- if we have modified
  			 * files that are in "foo/" we would lose
- 			 * it.
+ 			 * them.
  			 */
  			ret = verify_clean_subdirectory(ce, action, o);
  			if (ret < 0)
@@@ -895,7 -895,7 +895,7 @@@ int threeway_merge(struct cache_entry *
   * Two-way merge.
   *
   * The rule is to "carry forward" what is in the index without losing
 - * information across a "fast forward", favoring a successful merge
 + * information across a "fast-forward", favoring a successful merge
   * over a merge failure when it makes sense.  For details of the
   * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
   *