git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 01/10] "git read-tree -m" and the like require worktree
Date: Sun, 2 Mar 2008 17:33:16 +0700	[thread overview]
Message-ID: <20080302103316.GA8902@laptop> (raw)
In-Reply-To: <cover.1204453703.git.pclouds@gmail.com>


Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin-read-tree.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 0138f5a..a69bac4 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -220,6 +220,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	if ((opts.dir && !opts.update))
 		die("--exclude-per-directory is meaningless unless -u");
 
+	if (opts.merge && !opts.index_only)
+		setup_work_tree();
+
 	if (opts.prefix) {
 		int pfxlen = strlen(opts.prefix);
 		int pos;
-- 
1.5.4.2.281.g28d0e

       reply	other threads:[~2008-03-02 10:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1204453703.git.pclouds@gmail.com>
2008-03-02 10:33 ` Nguyễn Thái Ngọc Duy [this message]
2008-03-11 13:02   ` [PATCH 01/10] "git read-tree -m" and the like require worktree Johannes Schindelin
2008-03-11 14:57     ` Nguyen Thai Ngoc Duy
2008-03-11 15:06       ` Johannes Schindelin
2008-03-11 15:41         ` Nguyen Thai Ngoc Duy
2008-03-02 10:33 ` [PATCH 02/10] Make sure setup_git_directory is called before accessing repository Nguyễn Thái Ngọc Duy
2008-03-02 10:33 ` [PATCH 03/10] Make get_git_dir() and 'git rev-parse --git-dir' absolute path Nguyễn Thái Ngọc Duy
2008-03-11 13:20   ` Johannes Schindelin
2008-03-11 15:06     ` Nguyen Thai Ngoc Duy
2008-03-11 15:18       ` Johannes Schindelin
2008-03-11 15:39         ` Nguyen Thai Ngoc Duy
2008-03-11 16:20           ` Johannes Schindelin
2008-03-02 10:34 ` [PATCH 04/10] Make setup_work_tree() return new prefix Nguyễn Thái Ngọc Duy
2008-03-11 13:27   ` Johannes Schindelin
2008-03-11 15:18     ` Nguyen Thai Ngoc Duy
2008-03-02 10:34 ` [PATCH 05/10] http-push: Avoid calling setup_git_directory() twice Nguyễn Thái Ngọc Duy
2008-03-11 13:28   ` Johannes Schindelin
2008-03-11 14:54     ` Nguyen Thai Ngoc Duy
2008-03-11 15:08       ` Johannes Schindelin
2008-03-11 16:12         ` Nguyen Thai Ngoc Duy
2008-03-02 10:34 ` [PATCH 06/10] Completely move out worktree setup from setup_git_directory_gently() Nguyễn Thái Ngọc Duy
2008-03-11 13:31   ` Johannes Schindelin
2008-03-11 15:28     ` Nguyen Thai Ngoc Duy
2008-03-11 16:21       ` Johannes Schindelin
2008-03-02 10:34 ` [PATCH 07/10] builtin-archive: mark unused prefix "unused_prefix" Nguyễn Thái Ngọc Duy
2008-03-11 13:33   ` Johannes Schindelin
2008-03-11 14:50     ` Nguyen Thai Ngoc Duy
2008-03-11 15:38       ` Jay Soffian
2008-03-11 16:21         ` Nguyen Thai Ngoc Duy
2008-03-02 10:35 ` [PATCH 08/10] Make setup_git_directory() auto-setup worktree if found Nguyễn Thái Ngọc Duy
2008-03-02 10:35 ` [PATCH 09/10] Documentation: update api-builtin and api-setup Nguyễn Thái Ngọc Duy
2008-03-02 10:35 ` [PATCH 10/10] Additional tests to capture worktree special cases Nguyễn Thái Ngọc Duy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080302103316.GA8902@laptop \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).