[PATCH v4] git-prompt.sh: Option to hide prompt for ignored pwd

2015-01-04 Thread Richard Hansen
From: Jess Austin Optionally set __git_ps1 to display nothing when present working directory is ignored, triggered by the new environmental variable GIT_PS1_HIDE_IF_PWD_IGNORED. This environmental variable may be overridden on any repository by setting bash.hideIfPwdIgnored to "false". In the abs

Re: fast-import's notemodify doesn't work the same as git notes

2015-01-04 Thread Johan Herland
(sorry for the late answer, I've been away from email over the holidays) On Tue, Dec 23, 2014 at 1:06 AM, Mike Hommey wrote: > Hi, > > There are two major differences between adding notes with fast-import > and git notes, one of which is a serious problem: > > - fast-import doesn't want to add no

Re: [PATCH 2/3] checkout: add --ignore-other-wortrees

2015-01-04 Thread Mark Levedahl
On 01/03/2015 04:41 AM, Nguyễn Thái Ngọc Duy wrote: Noticed-by: Mark Levedahl Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 6 ++ builtin/checkout.c | 6 +- t/t2025-checkout-to.sh | 7 +++ 3 files changed, 18 insertions(+), 1 delet

Re: [PATCH 3/3] git-checkout.txt: a note about multiple checkout support for submodules

2015-01-04 Thread Mark Levedahl
On 01/03/2015 04:41 AM, Nguyễn Thái Ngọc Duy wrote: The goal seems to be using multiple checkouts to reduce disk space. But we have not reached an agreement how things should be. There are a couple options. - You may want to keep $SUB repos elsewhere (perhaps in a central place) outside $S

[RFC/PATCHv0 4/4] fast-import.c:note_change_n(): Rename commit_* to target_*

2015-01-04 Thread Johan Herland
Since we now allow adding notes to any kind of object (not just commits), rename the related variables from "commit_*" to "target_*". TODO: Also replace "commit-ish" with something more suitable in the documentation. However, the same needs to be done for the 'tag' command, and we also the BNF at

[RFC/PATCHv0 2/4] fast-import.c:do_change_note_fanout(): Also apply load_tree() to initial root

2015-01-04 Thread Johan Herland
TODO: tests! do_change_note_fanout() recursively traverses a "struct tree_entry" data structure. Before recursively traversing into a subtree, we make sure to call load_tree() on that subtree. However, for the initial/root struct tree_entry object, we assumed that load_tree() had already been invo

[RFC/PATCHv0 3/4] fast-import: Support adding notes to non-commits

2015-01-04 Thread Johan Herland
"git notes" allows adding notes to non-commit objects, but fast-import restricts the 'notemodify' command to only add notes for commit objects. Remove that silly restriction from fast-import. Suggested-by: Mike Hommey Signed-off-by: Johan Herland --- fast-import.c| 12 --

[RFC/PATCHv0 1/4] fast-import.c:do_change_note_fanout(): Remove unneeded local var 't'

2015-01-04 Thread Johan Herland
The struct tree_content *t variable was used as a shorthand for the given root->tree, but it was only used in the first two lines of the for loop, so the shorthand itself does not add much value. Furthermore, since the for loop body might end up reallocating root->tree we had to reinitialize t at t

profile-fast is failing in my Git 2.2.1 build from tar in a Git repo

2015-01-04 Thread Paul Smith
Is anyone aware of this? It seems that profile-fast fails when invoked from a downloaded tarball, if you are in a Git repository when you unpack it. So, for example, I have: $ cd $HOME/src $ git status On branch master Your branch is up-to-date with 'origin/master'. (this is NOT the Git

Re: [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-04 Thread Junio C Hamano
Philip Oakley writes: > The assume-unchanged bit, and consequently core.ignoreStat, can be > misunderstood. Be assertive about the expectation that file changes should > notified to Git. > > Signed-off-by: Philip Oakley > --- > Overhaul the general wording thus: > 1. direct description of wh

Re: PATCH/RFC: format-patch: Add format.subjectprefixsep to change separators

2015-01-04 Thread Junio C Hamano
Marc Finet writes: > Some mailing list use "PATCH:" rather than "[PATCH]" to prefix > patches, so introduce a new option to configure: > - 2 chars that would enclose PATCH (and counters) > - 1 char that would come just after the PATCH (and counters) > --- > This mail has been sent with: > git

PATCH/RFC: format-patch: Add format.subjectprefixsep to change separators

2015-01-04 Thread Marc Finet
Some mailing list use "PATCH:" rather than "[PATCH]" to prefix patches, so introduce a new option to configure: - 2 chars that would enclose PATCH (and counters) - 1 char that would come just after the PATCH (and counters) --- This mail has been sent with: git -c format.subjectprefixsep=: send-e

[PATCH] subtree: fix AsciiDoc list item continuation

2015-01-04 Thread Steffen Prohaska
List items must be continued with '+' (see [asciidoc]). [asciidoc] AsciiDoc user guide 17.7. List Item Continuation Signed-off-by: Steffen Prohaska --- contrib/subtree/git-subtree.txt | 194 ++-- 1 fi

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

2015-01-04 Thread Alexander Kuleshov
Yes, like this, but is it suitable for: >> die "msg\n", >> "\tvar1=val1\n", >> "\tvar2=val2\n", >> defined $var3 ? "\tvar3=val3\n" : ""; ? I finally got confused, how to print it... 2014-12-30 22:13 GMT+06:00 Junio C Hamano : > Alex Kuleshov writes: >