From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 8/9] Make setup_git_directory() auto-setup worktree if found
Date: Wed, 27 Feb 2008 23:40:27 +0700 [thread overview]
Message-ID: <20080227164027.GA28128@laptop> (raw)
In-Reply-To: <cover.1204130175.git.pclouds@gmail.com>
The semantic is simpler: if worktree is found, use it or die.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin-ls-files.c | 4 ++--
builtin-rev-parse.c | 7 +++++--
builtin-rm.c | 5 ++---
setup.c | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index cf4c492..a53881d 100644
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -566,8 +566,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
break;
}
- if (require_work_tree && !is_inside_work_tree())
- prefix = setup_work_tree(prefix);
+ if (require_work_tree && !get_git_work_tree())
+ die("This operation must be run in a work tree");
if (prefix_offset == -1)
prefix_offset = prefix ? strlen(prefix) : 0;
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index e82cac2..384e23f 100644
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -359,15 +359,16 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
return 0;
}
-int cmd_rev_parse(int argc, const char **argv, const char *prefix)
+int cmd_rev_parse(int argc, const char **argv, const char *unused_prefix)
{
int i, as_is = 0, verify = 0;
unsigned char sha1[20];
+ const char *prefix = NULL;
if (argc > 1 && !strcmp("--parseopt", argv[1]))
return cmd_parseopt(argc - 1, argv + 1, prefix);
- prefix = setup_git_directory();
+ setup_git_directory_gently(NULL);
git_config(git_default_config);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@ -487,6 +488,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
printf("%s\n", work_tree);
continue;
}
+ else
+ pfx = prefix = setup_work_tree(prefix);
while (pfx) {
pfx = strchr(pfx, '/');
if (pfx) {
diff --git a/builtin-rm.c b/builtin-rm.c
index 2c15d66..dedef9f 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -155,10 +155,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (!argc)
usage_with_options(builtin_rm_usage, builtin_rm_options);
- if (!index_only)
- prefix = setup_work_tree(prefix);
-
pathspec = get_pathspec(prefix, argv);
+ if (!pathspec)
+ die("No valid pathspec");
seen = NULL;
for (i = 0; pathspec[i] ; i++)
/* nothing */;
diff --git a/setup.c b/setup.c
index 78ae2f9..f0de42f 100644
--- a/setup.c
+++ b/setup.c
@@ -444,5 +444,5 @@ int check_repository_format(void)
const char *setup_git_directory(void)
{
setup_git_directory_gently(NULL);
- return is_inside_work_tree() ? setup_work_tree(NULL) : NULL;
+ return get_git_work_tree() ? setup_work_tree(NULL) : NULL;
}
--
1.5.4.2.281.g28d0e
next prev parent reply other threads:[~2008-02-27 16:41 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1204130175.git.pclouds@gmail.com>
2008-02-27 16:38 ` [PATCH 1/9] "git read-tree -m" and the like require worktree Nguyễn Thái Ngọc Duy
2008-02-28 0:48 ` Junio C Hamano
2008-02-28 3:22 ` Nguyen Thai Ngoc Duy
2008-02-27 16:38 ` [PATCH 2/9] Make sure setup_git_directory is called before accessing repository Nguyễn Thái Ngọc Duy
2008-02-27 16:38 ` [PATCH 3/9] Make get_git_dir() and 'git rev-parse --git-dir' absolute path Nguyễn Thái Ngọc Duy
2008-02-27 16:39 ` [PATCH 4/9] Make setup_work_tree() return new prefix Nguyễn Thái Ngọc Duy
2008-02-28 11:30 ` Johannes Schindelin
2008-02-28 13:02 ` Nguyen Thai Ngoc Duy
2008-02-28 15:53 ` Johannes Schindelin
2008-02-27 16:39 ` [PATCH 5/9] http-push: Avoid calling setup_git_directory() twice Nguyễn Thái Ngọc Duy
2008-02-28 0:50 ` Junio C Hamano
2008-02-28 3:26 ` Nguyen Thai Ngoc Duy
2008-02-27 16:39 ` [PATCH 6/9] Completely move out worktree setup from setup_git_directory_gently() Nguyễn Thái Ngọc Duy
2008-02-28 2:17 ` Junio C Hamano
2008-02-28 3:31 ` Nguyen Thai Ngoc Duy
2008-02-28 3:37 ` Junio C Hamano
2008-02-28 4:09 ` Nguyen Thai Ngoc Duy
2008-02-28 11:26 ` Johannes Schindelin
2008-02-28 12:52 ` Nguyen Thai Ngoc Duy
2008-02-27 16:40 ` [PATCH 7/9] builtin-archive: mark unused prefix "unused_prefix" Nguyễn Thái Ngọc Duy
2008-02-27 16:40 ` Nguyễn Thái Ngọc Duy [this message]
2008-02-27 16:40 ` [PATCH 9/9] Documentation: update api-builtin and api-setup Nguyễn Thái Ngọc Duy
2011-04-05 8:07 ` Jonathan Nieder
2011-04-05 11:32 ` Nguyen Thai Ngoc 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080227164027.GA28128@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).