From: Junio C Hamano <gitster@pobox.com>
To: Ted Pavlic <ted@tedpavlic.com>
Cc: spearce@spearce.org, git@vger.kernel.org
Subject: Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE from breaking when CWD is .git
Date: Wed, 11 Feb 2009 08:56:09 -0800 [thread overview]
Message-ID: <7vprhogbfa.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1234366634-17900-4-git-send-email-ted@tedpavlic.com> (Ted Pavlic's message of "Wed, 11 Feb 2009 10:37:14 -0500")
Ted Pavlic <ted@tedpavlic.com> writes:
> The GIT_PS1_DIRTYSTATE support uses a "git diff" to see if a "*" should
> be placed after the branch name. The "git diff" fails with an ugly error
> if the user has just changed directory into GIT_DIR.
>
> This patch uses "git rev-parse --is-inside-work-tree" to determine
> whether a "--work-tree=.." should be added to the "git diff".
Why ".."? What prevents you from "cd .git/refs/heads"?
Your "is-inside-work-tree" might be a good change, but if you were to
spend a letter to notify the users, "Warning: You are inside GIT_DIR! This
is something unusual, proceed with caution." is a lot more important
notice to give them than "You seem to have unstaged changes" notice.
You have at least three possible states:
* You are not in git repository at all;
* You are somewhere in $GIT_DIR, perhaps in a bare repository, perhaps a
repository with a work tree.
* You are inside a work tree.
The first should be quiet, the second should say "Proceed with caution,
any 'rm -f file' or 'edit file' you do here should be to recover from
unusual repository corruptoin only; you are welcome to look but don't
touch.", and the last one is Ok to say "You have unstaged changes."
next prev parent reply other threads:[~2009-02-11 16:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 15:37 [PATCH 0/3] completion: Convention updates and DIRTYSTATE fix Ted Pavlic
2009-02-11 15:37 ` [PATCH 1/3] completion: For consistency, changed "git rev-parse" to __gitdir calls Ted Pavlic
2009-02-11 15:37 ` [PATCH 2/3] completion: Change "if [...]" to "if test ..." to match git convention Ted Pavlic
2009-02-11 15:37 ` [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE from breaking when CWD is .git Ted Pavlic
2009-02-11 16:18 ` [PATCH 4/3] completion: More fixes to prevent unbound variable errors Ted Pavlic
2009-02-11 16:28 ` Shawn O. Pearce
2009-02-11 16:26 ` [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE from breaking when CWD is .git Shawn O. Pearce
2009-02-11 16:53 ` Ted Pavlic
2009-02-11 16:56 ` Junio C Hamano [this message]
2009-02-11 17:20 ` Ted Pavlic
2009-02-11 18:01 ` Shawn O. Pearce
2009-02-11 16:24 ` [PATCH 2/3] completion: Change "if [...]" to "if test ..." to match git convention Shawn O. Pearce
2009-02-11 16:36 ` Ted Pavlic
2009-02-11 17:14 ` Junio C Hamano
2009-02-11 16:46 ` Junio C Hamano
2009-02-11 16:22 ` [PATCH 1/3] completion: For consistency, changed "git rev-parse" to __gitdir calls Shawn O. Pearce
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=7vprhogbfa.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=ted@tedpavlic.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.
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).