We cannot call write_ref_sha1() from within a for_each_ref() callback, since
it will free() the ref_list that the for_each_ref() is currently traversing.
Therefore rewrite setup_tmp_ref() to not call write_ref_sha1(), as already
hinted at in a comment.
This causes the t5700-clone-reference testcases to pass for me.
Signed-off-by: Johan Herland <johan@xxxxxxxxxxx>
---
On Tuesday 26 February 2008, Johan Herland wrote:
> On Tuesday 26 February 2008, Johan Herland wrote:
> > Running this test with GDB, I get the following backtrace:
> >
> > #0 0x0000000000474b87 in is_null_sha1 (sha1=0x100000008 <Address 0x100000008 out of bounds>) at cache.h:464
> > #1 0x0000000000474ad3 in do_one_ref (base=0x4dc8ff "refs/", fn=0x419471 <setup_tmp_ref>, trim=0, cb_data=0x7498d0, entry=0xffffffff) at refs.c:474
> > #2 0x0000000000474e28 in do_for_each_ref (base=0x4dc8ff "refs/", fn=0x419471 <setup_tmp_ref>, trim=0, cb_data=0x7498d0) at refs.c:558
> > #3 0x0000000000474ecd in for_each_ref (fn=0x419471 <setup_tmp_ref>, cb_data=0x7498d0) at refs.c:580
> > #4 0x0000000000419706 in setup_reference (repo=0x745070 "C/.git") at builtin-clone.c:211
> > #5 0x0000000000419fce in cmd_clone (argc=2, argv=0x7fff7a282fa0, prefix=0x0) at builtin-clone.c:422
> > #6 0x0000000000404ba3 in run_command (p=0x6ff710, argc=7, argv=0x7fff7a282fa0) at git.c:248
> > #7 0x0000000000404d55 in handle_internal_command (argc=7, argv=0x7fff7a282fa0) at git.c:378
> > #8 0x0000000000404ebe in main (argc=7, argv=0x7fff7a282fa0) at git.c:442
> >
> > Seems the "loose" ref_list in do_for_each_ref() becomes corrupted.
>
> ...and the corruption is done when setup_tmp_ref() calls write_ref_sha1()
> which calls invalidate_cached_refs() (which frees the ref_list that
> do_for_each_ref() is iterating over).
>
> Not sure how to best solve this. Maybe setup_tmp_ref() shouldn't use
> write_ref_sha1(), but write the ref file directly instead, as hinted
> at in a comment in setup_tmp_ref()?
Here is a shot at fixing this, although I'm not sure it's the best way
of doing so.
Have fun! :)
...Johan
builtin-clone.c | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/builtin-clone.c b/builtin-clone.c
index 6e34e52..d5baffc 100644
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -136,14 +136,12 @@ static int
setup_tmp_ref(const char *refname,
const unsigned char *sha1, int flags, void *cb_data)
{
- const char *ref_temp = cb_data;
+ const char *ref_temp = cb_data, *sha1_hex = sha1_to_hex(sha1);
char *path;
- struct lock_file lk;
- struct ref_lock *rl;
+ int fd;
/*
- echo "$ref_git/objects" >"$GIT_DIR/objects/info/alternates"
(
GIT_DIR="$ref_git" git for-each-ref \
--format='%(objectname) %(*objectname)'
@@ -158,25 +156,24 @@ setup_tmp_ref(const char *refname,
*/
- /* We go a bit out of way to use write_ref_sha1() here. We
- * could just write the ref file directly, since neither
- * locking or reflog really matters here. However, let's use
- * the standard interface for writing refs as much as is
- * possible given that get_git_dir() != the repo we're writing
- * the refs in. */
-
- printf("%s -> %s/%s\n",
- sha1_to_hex(sha1), ref_temp, sha1_to_hex(sha1));
-
- path = mkpath("%s/%s", ref_temp, sha1_to_hex(sha1));
- rl = xmalloc(sizeof *rl);
- rl->force_write = 1;
- rl->lk = &lk;
- rl->ref_name = xstrdup(sha1_to_hex(sha1));
- rl->orig_ref_name = xstrdup(rl->ref_name);
- rl->lock_fd = hold_lock_file_for_update(rl->lk, path, 1);
- if (write_ref_sha1(rl, sha1, NULL) < 0)
- die("failed to write temporary ref %s", lk.filename);
+ /* Write the ref file directly, since neither locking or reflog really
+ * matters here. We should probably use some standard interface for
+ * writing refs here, although write_ref_sha1() does not work.
+ * (It frees the ref_list that is currently being iterated by
+ * for_each_ref().) Keep in mind that get_git_dir() != the repo we're
+ * writing the refs in. */
+
+ path = mkpath("%s/%s", ref_temp, sha1_hex);
+
+ printf("%s -> %s\n", sha1_hex, path);
+
+ fd = open(path, O_CREAT | O_WRONLY, 0666);
+ if (fd < 0)
+ die("failed to create %s", path);
+ write_or_die(fd, sha1_hex, strlen(sha1_hex));
+ if (close(fd))
+ die("could not close %s", path);
+ fprintf(stderr, "Wrote %s to %s\n", sha1_hex, path);
return 0;
}
--
1.5.4.3.342.g99e8
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
