From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 13/26] worktree.c: store "id" instead of "git_dir" Date: Tue, 16 Feb 2016 20:29:14 +0700 Message-ID: <1455629367-26193-14-git-send-email-pclouds@gmail.com> References: <1454492150-10628-1-git-send-email-pclouds@gmail.com> <1455629367-26193-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Feb 16 14:32:16 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aVfji-0004PL-LV for gcvg-git-2@plane.gmane.org; Tue, 16 Feb 2016 14:32:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932480AbcBPNcD convert rfc822-to-quoted-printable (ORCPT ); Tue, 16 Feb 2016 08:32:03 -0500 Received: from mail-pf0-f176.google.com ([209.85.192.176]:35609 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932371AbcBPNac (ORCPT ); Tue, 16 Feb 2016 08:30:32 -0500 Received: by mail-pf0-f176.google.com with SMTP id c10so107566403pfc.2 for ; Tue, 16 Feb 2016 05:30:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=tUL9m/Jyvsjq7/XKGBz7J6ketgHyHWyBTr7CLY1n3Eg=; b=xzQkZafP6fI3Nr7eJ4ZU7ixqTbRz0qahrA5Oc1FeOHLuvXgwdvXhNPI76BKOQOeXiU YpSgjJzJnXBCPNSeRsfNFLDzbj5k/WurM8DDnwV5PlETuvJHpgKLsBms8qP1cAMqY5Gz Fk6AVOCNrWw3mJEq5aBnx2GCuG6ZFRMtxmq2FOh5d34XIwHkaCvvZ3O8Q3oMuuwuVbu8 OW0YyZxiIWHD29q/azXLCaSTUdlR4AG0+LfrsOU1KXOJmsmT5mM62ns+hsbFryUQUeI5 ZSi+QEMzYR6j7yyZhwFZ/O+HU9qRLI8g/7RaIGB254/Rjyma1MZ4nk6EKq73vjcGEc+7 AgMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=tUL9m/Jyvsjq7/XKGBz7J6ketgHyHWyBTr7CLY1n3Eg=; b=GIIsmahC1Mj6jS/w+mQ1FWdGbz06ARJsvjuUu86aHY13FY92c6maQ6sz04/xfVe/2o NT7q/NP2PTLrh2NhnnlFNTxRx904DHol2PhswVkn9FD/XnpmbasAian3Q/acUrDi3tDv hw0GbwKMgDajcJ1Xt9k2EFjgtzvHP9dNKpd5ogPm0auW8whiKjLV8wFsqNCcfMspaX1w apYGtBVr6hI+duNXoZeTR7MaYWJMPTfBv9r+vgEKqpqsuaCMLGV2+Z8ntftKug1f65Zf 8GWuYEmlaNUJRQrCvqWomG9q7oTqMvXc6XY7FtiT+e2QriezsD4G+Y3tUYGZGil/BVJ1 H2+g== X-Gm-Message-State: AG10YOQJeJCRadU8HOb8jO15HFprN0SLZawwcDpWa8ALhtZIXeeg+DcO1M7xhyPFTZuX1g== X-Received: by 10.98.86.8 with SMTP id k8mr30406245pfb.28.1455629432204; Tue, 16 Feb 2016 05:30:32 -0800 (PST) Received: from lanh ([115.76.228.161]) by smtp.gmail.com with ESMTPSA id 9sm45928667pfc.69.2016.02.16.05.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Feb 2016 05:30:30 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Tue, 16 Feb 2016 20:30:55 +0700 X-Mailer: git-send-email 2.7.0.377.g4cd97dd In-Reply-To: <1455629367-26193-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We can reconstruct git_dir from id quite easily. It's a bit hackier to do the reverse. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- worktree.c | 29 ++++++++++++++++------------- worktree.h | 7 ++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/worktree.c b/worktree.c index ddb8cb7..4c38414 100644 --- a/worktree.c +++ b/worktree.c @@ -10,7 +10,7 @@ void free_worktrees(struct worktree **worktrees) =20 for (i =3D 0; worktrees[i]; i++) { free(worktrees[i]->path); - free(worktrees[i]->git_dir); + free(worktrees[i]->id); free(worktrees[i]->head_ref); free(worktrees[i]); } @@ -75,13 +75,11 @@ static struct worktree *get_main_worktree(void) struct worktree *worktree =3D NULL; struct strbuf path =3D STRBUF_INIT; struct strbuf worktree_path =3D STRBUF_INIT; - struct strbuf gitdir =3D STRBUF_INIT; struct strbuf head_ref =3D STRBUF_INIT; int is_bare =3D 0; int is_detached =3D 0; =20 - strbuf_addf(&gitdir, "%s", absolute_path(get_git_common_dir())); - strbuf_addbuf(&worktree_path, &gitdir); + strbuf_addstr(&worktree_path, absolute_path(get_git_common_dir())); is_bare =3D !strbuf_strip_suffix(&worktree_path, "/.git"); if (is_bare) strbuf_strip_suffix(&worktree_path, "/."); @@ -93,7 +91,7 @@ static struct worktree *get_main_worktree(void) =20 worktree =3D xmalloc(sizeof(struct worktree)); worktree->path =3D strbuf_detach(&worktree_path, NULL); - worktree->git_dir =3D strbuf_detach(&gitdir, NULL); + worktree->id =3D NULL; worktree->is_bare =3D is_bare; worktree->head_ref =3D NULL; worktree->is_detached =3D is_detached; @@ -101,7 +99,6 @@ static struct worktree *get_main_worktree(void) =20 done: strbuf_release(&path); - strbuf_release(&gitdir); strbuf_release(&worktree_path); strbuf_release(&head_ref); return worktree; @@ -112,16 +109,13 @@ static struct worktree *get_linked_worktree(const= char *id) struct worktree *worktree =3D NULL; struct strbuf path =3D STRBUF_INIT; struct strbuf worktree_path =3D STRBUF_INIT; - struct strbuf gitdir =3D STRBUF_INIT; struct strbuf head_ref =3D STRBUF_INIT; int is_detached =3D 0; =20 if (!id) die("Missing linked worktree name"); =20 - strbuf_addf(&gitdir, "%s/worktrees/%s", - absolute_path(get_git_common_dir()), id); - strbuf_addf(&path, "%s/gitdir", gitdir.buf); + strbuf_git_common_path(&path, "worktrees/%s/gitdir", id); if (strbuf_read_file(&worktree_path, path.buf, 0) <=3D 0) /* invalid gitdir file */ goto done; @@ -141,7 +135,7 @@ static struct worktree *get_linked_worktree(const c= har *id) =20 worktree =3D xmalloc(sizeof(struct worktree)); worktree->path =3D strbuf_detach(&worktree_path, NULL); - worktree->git_dir =3D strbuf_detach(&gitdir, NULL); + worktree->id =3D xstrdup(id); worktree->is_bare =3D 0; worktree->head_ref =3D NULL; worktree->is_detached =3D is_detached; @@ -149,7 +143,6 @@ static struct worktree *get_linked_worktree(const c= har *id) =20 done: strbuf_release(&path); - strbuf_release(&gitdir); strbuf_release(&worktree_path); strbuf_release(&head_ref); return worktree; @@ -189,6 +182,14 @@ struct worktree **get_worktrees(void) return list; } =20 +const char *get_worktree_git_dir(const struct worktree *wt) +{ + if (wt->id) + return git_common_path("worktrees/%s", wt->id); + else + return get_git_common_dir(); +} + char *find_shared_symref(const char *symref, const char *target) { char *existing =3D NULL; @@ -200,7 +201,9 @@ char *find_shared_symref(const char *symref, const = char *target) for (i =3D 0; worktrees[i]; i++) { strbuf_reset(&path); strbuf_reset(&sb); - strbuf_addf(&path, "%s/%s", worktrees[i]->git_dir, symref); + strbuf_addf(&path, "%s/%s", + get_worktree_git_dir(worktrees[i]), + symref); =20 if (parse_ref(path.buf, &sb, NULL)) { continue; diff --git a/worktree.h b/worktree.h index b4b3dda..e89d423 100644 --- a/worktree.h +++ b/worktree.h @@ -3,7 +3,7 @@ =20 struct worktree { char *path; - char *git_dir; + char *id; char *head_ref; unsigned char head_sha1[20]; int is_detached; @@ -23,6 +23,11 @@ struct worktree { extern struct worktree **get_worktrees(void); =20 /* + * Return git dir of the worktree. Note that the path may be relative. + */ +extern const char *get_worktree_git_dir(const struct worktree *wt); + +/* * Free up the memory for worktree(s) */ extern void free_worktrees(struct worktree **); --=20 2.7.0.377.g4cd97dd