Merge branch 'jc/unresolve' into next

* jc/unresolve:
  Add git-unresolve <paths>...
  get_tree_entry(): make it available from tree-walk
  sha1_name.c: no need to include diff.h; tree-walk.h will do.
  sha1_name.c: prepare to make get_tree_entry() reusable from others.
  pre-commit hook: complain about conflict markers.
  git-merge: a bit more readable user guidance.
  diff: move diff.c to diff-lib.c to make room.
  git log: don't do merge diffs by default
  Allow "git repack" users to specify repacking window/depth

1 files changed, 4 insertions, 55 deletions

diff --git a/sha1_name.c b/sha1_name.c
index 0cd1139e06..345935bb2b 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -3,7 +3,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
-#include "diff.h"
+#include "tree-walk.h"
 
 static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
 {
@@ -450,59 +450,6 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
 	return get_short_sha1(name, len, sha1, 0);
 }
 
-static int get_tree_entry(const unsigned char *, const char *, unsigned char *);
-
-static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result)
-{
-	int namelen = strlen(name);
-	while (t->size) {
-		const char *entry;
-		const unsigned char *sha1;
-		int entrylen, cmp;
-		unsigned mode;
-
-		sha1 = tree_entry_extract(t, &entry, &mode);
-		update_tree_entry(t);
-		entrylen = strlen(entry);
-		if (entrylen > namelen)
-			continue;
-		cmp = memcmp(name, entry, entrylen);
-		if (cmp > 0)
-			continue;
-		if (cmp < 0)
-			break;
-		if (entrylen == namelen) {
-			memcpy(result, sha1, 20);
-			return 0;
-		}
-		if (name[entrylen] != '/')
-			continue;
-		if (!S_ISDIR(mode))
-			break;
-		if (++entrylen == namelen) {
-			memcpy(result, sha1, 20);
-			return 0;
-		}
-		return get_tree_entry(sha1, name + entrylen, result);
-	}
-	return -1;
-}
-
-static int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1)
-{
-	int retval;
-	void *tree;
-	struct tree_desc t;
-
-	tree = read_object_with_reference(tree_sha1, tree_type, &t.size, NULL);
-	if (!tree)
-		return -1;
-	t.buf = tree;
-	retval = find_tree_entry(&t, name, sha1);
-	free(tree);
-	return retval;
-}
-
 /*
  * This is like "get_sha1_basic()", except it allows "sha1 expressions",
  * notably "xyz^" for "parent of xyz"
@@ -510,6 +457,7 @@ static int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsi
 int get_sha1(const char *name, unsigned char *sha1)
 {
 	int ret;
+	unsigned unused;
 
 	prepare_alt_odb();
 	ret = get_sha1_1(name, strlen(name), sha1);
@@ -518,7 +466,8 @@ int get_sha1(const char *name, unsigned char *sha1)
 		if (cp) {
 			unsigned char tree_sha1[20];
 			if (!get_sha1_1(name, cp-name, tree_sha1))
-				return get_tree_entry(tree_sha1, cp+1, sha1);
+				return get_tree_entry(tree_sha1, cp+1, sha1,
+						      &unused);
 		}
 	}
 	return ret;