From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, jrnieder@gmail.com
Cc: git@vger.kernel.org, pclouds@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/2] revparse: introduce --is-inside-working-tree
Date: Mon, 20 Mar 2017 12:22:25 -0700 [thread overview]
Message-ID: <20170320192225.18928-3-sbeller@google.com> (raw)
In-Reply-To: <20170320192225.18928-1-sbeller@google.com>
This behaves the same as 'is-inside-worktree' and supersedes it.
See prior patch for discussion of "working tree" vs. "worktree"
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Documentation/git-rev-parse.txt | 4 ++--
builtin/rev-parse.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index c40c470448..55ee3bde55 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -228,8 +228,8 @@ print a message to stderr and exit with nonzero status.
When the current working directory is below the repository
directory print "true", otherwise "false".
---is-inside-work-tree::
- When the current working directory is inside the work tree of the
+--is-inside-working-tree::
+ When the current working directory is inside the working tree of the
repository print "true", otherwise "false".
--is-bare-repository::
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 2549643267..04da518058 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -851,7 +851,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
: "false");
continue;
}
- if (!strcmp(arg, "--is-inside-work-tree")) {
+ if (!strcmp(arg, "--is-inside-work-tree") ||
+ !strcmp(arg, "--is-inside-working-tree")) {
printf("%s\n", is_inside_work_tree() ? "true"
: "false");
continue;
--
2.12.0.306.g4a9b9b32d4.dirty
next prev parent reply other threads:[~2017-03-20 19:22 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch for submodule indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 1/4] git-prompt.sh: add " Benjamin Fuchs
2017-01-30 23:48 ` Junio C Hamano
2017-01-31 0:10 ` Benjamin Fuchs
2017-01-31 3:11 ` Junio C Hamano
2017-02-06 4:23 ` Stefan Beller
2017-02-06 5:55 ` Jacob Keller
2017-02-06 10:13 ` Stefan Beller
2017-01-30 20:44 ` [PATCH 2/4] git-prompt.sh: rework of " Benjamin Fuchs
2017-01-31 18:06 ` SZEDER Gábor
2017-01-30 20:44 ` [PATCH 3/4] git-prompt.sh: fix for submodule 'dirty' indicator Benjamin Fuchs
2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests for submodule indicator Benjamin Fuchs
2017-01-31 18:32 ` SZEDER Gábor
2017-01-31 22:06 ` Junio C Hamano
2017-01-31 22:12 ` Stefan Beller
2017-03-07 3:45 ` [RFC PATCH] rev-parse: add --show-superproject-working-tree Stefan Beller
2017-03-07 5:13 ` Junio C Hamano
2017-03-07 7:16 ` Junio C Hamano
2017-03-07 7:23 ` Junio C Hamano
2017-03-07 18:44 ` Junio C Hamano
2017-03-07 20:40 ` Stefan Beller
2017-03-07 22:49 ` Junio C Hamano
2017-03-08 0:56 ` [PATCHv2] " Stefan Beller
2017-03-08 1:30 ` Junio C Hamano
2017-03-08 6:01 ` Junio C Hamano
2017-03-08 19:20 ` [PATCHv3] " Stefan Beller
2017-03-08 22:28 ` Junio C Hamano
2017-03-08 23:07 ` [PATCHv4] " Stefan Beller
2017-03-08 23:51 ` Junio C Hamano
2017-03-17 22:28 ` Jonathan Nieder
2017-03-17 22:51 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Stefan Beller
2017-03-17 22:55 ` Jonathan Nieder
2017-03-17 23:04 ` Stefan Beller
2017-03-18 17:24 ` Junio C Hamano
2017-03-18 1:47 ` Junio C Hamano
2017-03-18 1:36 ` Junio C Hamano
2017-03-20 17:29 ` Stefan Beller
2017-03-20 18:12 ` Junio C Hamano
2017-03-20 18:50 ` Jonathan Nieder
2017-03-20 19:22 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Stefan Beller
2017-03-20 19:22 ` [PATCH 1/2] git.c: introduce --working-tree superseding --work-tree Stefan Beller
2017-03-20 19:58 ` Jonathan Nieder
2017-03-20 19:22 ` Stefan Beller [this message]
2017-03-20 20:00 ` [PATCH 2/2] revparse: introduce --is-inside-working-tree Jonathan Nieder
2017-03-20 19:37 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Junio C Hamano
2017-03-21 10:37 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Duy Nguyen
2017-03-21 15:48 ` Junio C Hamano
2017-03-23 17:06 ` Michael J Gruber
2017-03-23 17:55 ` Junio C Hamano
2017-03-25 12:07 ` Duy Nguyen
2017-04-07 13:59 ` Michael J Gruber
2017-04-07 16:14 ` Jacob Keller
2017-03-25 12:05 ` Duy Nguyen
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=20170320192225.18928-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
/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).