@ -2168,14 +2168,13 @@ void absorb_git_dir_into_superproject(const char *path,
}
}
}
}
const char *get_superproject_working_tree(void)
int get_superproject_working_tree(struct strbuf *buf)
{
{
static struct strbuf realpath = STRBUF_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf sb = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
struct strbuf one_up = STRBUF_INIT;
struct strbuf one_up = STRBUF_INIT;
const char *cwd = xgetcwd();
const char *cwd = xgetcwd();
const char *ret = NULL;
int ret = 0;
const char *subpath;
const char *subpath;
int code;
int code;
ssize_t len;
ssize_t len;
@ -2186,10 +2185,10 @@ const char *get_superproject_working_tree(void)
* We might have a superproject, but it is harder
* We might have a superproject, but it is harder
* to determine.
* to determine.
*/
*/
return NULL;
return 0;
if (!strbuf_realpath(&one_up, "../", 0))
if (!strbuf_realpath(&one_up, "../", 0))
return NULL;
return 0;
subpath = relative_path(cwd, one_up.buf, &sb);
subpath = relative_path(cwd, one_up.buf, &sb);
strbuf_release(&one_up);
strbuf_release(&one_up);
@ -2233,8 +2232,8 @@ const char *get_superproject_working_tree(void)
super_wt = xstrdup(cwd);
super_wt = xstrdup(cwd);
super_wt[cwd_len - super_sub_len] = '\0';
super_wt[cwd_len - super_sub_len] = '\0';
strbuf_realpath(&realpath, super_wt, 1);
strbuf_realpath(buf, super_wt, 1);
ret = realpath.buf;
ret = 1;
free(super_wt);
free(super_wt);
}
}
strbuf_release(&sb);
strbuf_release(&sb);
@ -2243,10 +2242,10 @@ const char *get_superproject_working_tree(void)
if (code == 128)
if (code == 128)
/* '../' is not a git repository */
/* '../' is not a git repository */
return NULL;
return 0;
if (code == 0 && len == 0)
if (code == 0 && len == 0)
/* There is an unrelated git repository at '../' */
/* There is an unrelated git repository at '../' */
return NULL;
return 0;
if (code)
if (code)
die(_("ls-tree returned unexpected return code %d"), code);
die(_("ls-tree returned unexpected return code %d"), code);