Merge branch 'jn/per-repo-object-store-fixes'

gitster · gitster · commit ceb7a01aac90 · 2017-09-25T15:24:07.000+09:00
Step #0 of a planned &amp; larger series to make the in-core object
store per in-core repository object.

* jn/per-repo-object-store-fixes:
  replace-objects: evaluate replacement refs without using the object store
  push, fetch: error out for submodule entries not pointing to commits
  pack: make packed_git_mru global a value instead of a pointer
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -1012,7 +1012,7 @@ static int want_object_in_pack(const unsigned char *sha1,
 			return want;
 	}
 
-	for (entry = packed_git_mru->head; entry; entry = entry->next) {
+	for (entry = packed_git_mru.head; entry; entry = entry->next) {
 		struct packed_git *p = entry->item;
 		off_t offset;
 
@@ -1030,7 +1030,7 @@ static int want_object_in_pack(const unsigned char *sha1,
 			}
 			want = want_found_object(exclude, p);
 			if (!exclude && want > 0)
-				mru_mark(packed_git_mru, entry);
+				mru_mark(&packed_git_mru, entry);
 			if (want != -1)
 				return want;
 		}
diff --git a/cache.h b/cache.h
@@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "strbuf.h"
 #include "hashmap.h"
+#include "mru.h"
 #include "advice.h"
 #include "gettext.h"
 #include "convert.h"
@@ -1589,8 +1590,7 @@ extern struct packed_git {
  * A most-recently-used ordered version of the packed_git list, which can
  * be iterated instead of packed_git (and marked via mru_mark).
  */
-struct mru;
-extern struct mru *packed_git_mru;
+extern struct mru packed_git_mru;
 
 struct pack_entry {
 	off_t offset;
diff --git a/packfile.c b/packfile.c
@@ -40,9 +40,7 @@ static unsigned int pack_max_fds;
 static size_t peak_pack_mapped;
 static size_t pack_mapped;
 struct packed_git *packed_git;
-
-static struct mru packed_git_mru_storage;
-struct mru *packed_git_mru = &packed_git_mru_storage;
+struct mru packed_git_mru;
 
 #define SZ_FMT PRIuMAX
 static inline uintmax_t sz_fmt(size_t s) { return s; }
@@ -861,9 +859,9 @@ static void prepare_packed_git_mru(void)
 {
 	struct packed_git *p;
 
-	mru_clear(packed_git_mru);
+	mru_clear(&packed_git_mru);
 	for (p = packed_git; p; p = p->next)
-		mru_append(packed_git_mru, p);
+		mru_append(&packed_git_mru, p);
 }
 
 static int prepare_packed_git_run_once = 0;
@@ -1832,9 +1830,9 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 	if (!packed_git)
 		return 0;
 
-	for (p = packed_git_mru->head; p; p = p->next) {
+	for (p = packed_git_mru.head; p; p = p->next) {
 		if (fill_pack_entry(sha1, e, p->item)) {
-			mru_mark(packed_git_mru, p);
+			mru_mark(&packed_git_mru, p);
 			return 1;
 		}
 	}
diff --git a/refs.c b/refs.c
@@ -1357,7 +1357,7 @@ int for_each_replace_ref(each_ref_fn fn, void *cb_data)
 	return do_for_each_ref(get_main_ref_store(),
 			       git_replace_ref_base, fn,
 			       strlen(git_replace_ref_base),
-			       0, cb_data);
+			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
 }
 
 int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
diff --git a/submodule.c b/submodule.c
@@ -774,19 +774,36 @@ static int append_oid_to_argv(const struct object_id *oid, void *data)
 	return 0;
 }
 
+struct has_commit_data {
+	int result;
+	const char *path;
+};
+
 static int check_has_commit(const struct object_id *oid, void *data)
 {
-	int *has_commit = data;
+	struct has_commit_data *cb = data;
 
-	if (!lookup_commit_reference(oid))
-		*has_commit = 0;
+	enum object_type type = sha1_object_info(oid->hash, NULL);
 
-	return 0;
+	switch (type) {
+	case OBJ_COMMIT:
+		return 0;
+	case OBJ_BAD:
+		/*
+		 * Object is missing or invalid. If invalid, an error message
+		 * has already been printed.
+		 */
+		cb->result = 0;
+		return 0;
+	default:
+		die(_("submodule entry '%s' (%s) is a %s, not a commit"),
+		    cb->path, oid_to_hex(oid), typename(type));
+	}
 }
 
 static int submodule_has_commits(const char *path, struct oid_array *commits)
 {
-	int has_commit = 1;
+	struct has_commit_data has_commit = { 1, path };
 
 	/*
 	 * Perform a cheap, but incorrect check for the existence of 'commits'.
@@ -802,7 +819,7 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
 
 	oid_array_for_each_unique(commits, check_has_commit, &has_commit);
 
-	if (has_commit) {
+	if (has_commit.result) {
 		/*
 		 * Even if the submodule is checked out and the commit is
 		 * present, make sure it exists in the submodule's object store
@@ -821,12 +838,12 @@ static int submodule_has_commits(const char *path, struct oid_array *commits)
 		cp.dir = path;
 
 		if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
-			has_commit = 0;
+			has_commit.result = 0;
 
 		strbuf_release(&out);
 	}
 
-	return has_commit;
+	return has_commit.result;
 }
 
 static int submodule_needs_pushing(const char *path, struct oid_array *commits)
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
@@ -298,6 +298,16 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
 	)
 '
 
+test_expect_success 'submodule entry pointing at a tag is error' '
+	git -C work/gar/bage tag -a test1 -m "tag" &&
+	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
+	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
+	git -C work commit -m "bad commit" &&
+	test_when_finished "git -C work reset --hard HEAD^" &&
+	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&
+	test_i18ngrep "is a tag, not a commit" err
+'
+
 test_expect_success 'push fails if recurse submodules option passed as yes' '
 	(
 		cd work/gar/bage &&

Original file line number	Diff line number	Diff line change
`@@ -1012,7 +1012,7 @@ static int want_object_in_pack(const unsigned char *sha1,`
`1012`	`1012`	`return want;`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`		`- for (entry = packed_git_mru->head; entry; entry = entry->next) {`
	`1015`	`+ for (entry = packed_git_mru.head; entry; entry = entry->next) {`
`1016`	`1016`	`struct packed_git *p = entry->item;`
`1017`	`1017`	`off_t offset;`
`1018`	`1018`
`@@ -1030,7 +1030,7 @@ static int want_object_in_pack(const unsigned char *sha1,`
`1030`	`1030`	`}`
`1031`	`1031`	`want = want_found_object(exclude, p);`
`1032`	`1032`	`if (!exclude && want > 0)`
`1033`		`- mru_mark(packed_git_mru, entry);`
	`1033`	`+ mru_mark(&packed_git_mru, entry);`
`1034`	`1034`	`if (want != -1)`
`1035`	`1035`	`return want;`
`1036`	`1036`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ int for_each_replace_ref(each_ref_fn fn, void *cb_data)`
`1357`	`1357`	`return do_for_each_ref(get_main_ref_store(),`
`1358`	`1358`	`git_replace_ref_base, fn,`
`1359`	`1359`	`strlen(git_replace_ref_base),`
`1360`		`- 0, cb_data);`
	`1360`	`+ DO_FOR_EACH_INCLUDE_BROKEN, cb_data);`
`1361`	`1361`	`}`
`1362`	`1362`
`1363`	`1363`	`int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,16 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from`
`298`	`298`	`)`
`299`	`299`	`'`
`300`	`300`
	`301`	`+test_expect_success 'submodule entry pointing at a tag is error' '`
	`302`	`+ git -C work/gar/bage tag -a test1 -m "tag" &&`
	`303`	`+ tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&`
	`304`	`+ git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&`
	`305`	`+ git -C work commit -m "bad commit" &&`
	`306`	`+ test_when_finished "git -C work reset --hard HEAD^" &&`
	`307`	`+ test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&`
	`308`	`+ test_i18ngrep "is a tag, not a commit" err`
	`309`	`+'`
	`310`	`+`
`301`	`311`	`test_expect_success 'push fails if recurse submodules option passed as yes' '`
`302`	`312`	`(`
`303`	`313`	`cd work/gar/bage &&`