Re: [PATCH v1 3/3] travis-ci: run Git bisect on failed tests

2016-05-23 Thread Lars Schneider
> On 22 May 2016, at 19:21, Pranit Bauva wrote: > > Hey Lars, > > On Sun, May 22, 2016 at 4:30 PM, wrote: >> From: Lars Schneider >> ... >> + >> +# >> +# Run Git bisect >> +# >> +run_bisect () { >> + TEST_SCRIPT=$1 >> + BAD_REV=$2 >> + GOOD_RV=$3 >> + TMPDIR=$(mktemp

Re: [PATCH v2 0/5] worktree lock/unlock

2016-05-23 Thread Duy Nguyen
On Mon, May 23, 2016 at 11:51 AM, Eric Sunshine wrote: > On Sun, May 22, 2016 at 6:43 AM, Nguyễn Thái Ngọc Duy > wrote: >> This should address all of Eric's comments (thanks!). An extra change >> I made is free_worktrees() at the end of {,un}lock_worktree() to avoid >> leaking. This series depen

Re: [PATCH v2 6/6] worktree: simplify prefixing paths

2016-05-23 Thread Duy Nguyen
On Mon, May 23, 2016 at 11:31 AM, Eric Sunshine wrote: > On Sun, May 22, 2016 at 7:32 PM, Eric Sunshine > wrote: >> On Sun, May 22, 2016 at 5:33 AM, Nguyễn Thái Ngọc Duy >> wrote: >>> @@ -467,6 +467,8 @@ int cmd_worktree(int ac, const char **av, const char >>> *prefix) >>> if (ac < 2)

git log: invert --author and --committer

2016-05-23 Thread Per Cederqvist
We have a repository that mostly contains configuration data. This is updated by our continuous integration build system, but every once in a while there are also more interesting commits made by humans. For several years I have suffered in silence, wishing for a way to do something like git

Re: [PATCH v6 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Johannes Schindelin
Hi Pranit, On Fri, 20 May 2016, Pranit Bauva wrote: > Frankly, I have no idea what you mean by libification but I will use > error() since efforts for libification have already started. The term "libification" is frequently used in the Git project: it means to convert code that was formerly used

Re: [PATCH 2/2] bisect--helper: `bisect_voc` shell function in C

2016-05-23 Thread Johannes Schindelin
Hi Pranit, On Fri, 20 May 2016, Pranit Bauva wrote: > On Mon, May 16, 2016 at 12:10 PM, Johannes Schindelin > wrote: > > > > On Sat, 14 May 2016, Pranit Bauva wrote: > > > >> Reimplement the `bisect_voc` shell function in C. This is a too small > >> function to be called as a subcommand though t

Re: Odd Difference Between Windows Git and Standard Git

2016-05-23 Thread Johannes Schindelin
Hi, On Fri, 20 May 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > Thanks for asking a great question. I somehow expected that we > > probe in init-db.c::create_default_files() for this when we probe > > for case sensitivity, symlinks, etc., but apparently we don't. > > Ah, we do p

Re: [Opinion gathering] Git remote whitelist/blacklist

2016-05-23 Thread Francois Beutin
I agree that we cannot have a completly secure and reliable way to forbid a push to the wrong remote. This is not what our feature is trying to do, we assume that if a programmer tweaks his config file and changes the rules he knows what he is doing and we won't try to prevent it. Our goal is to

[PATCH v3] upload-pack.c: use of parse-options API

2016-05-23 Thread Antoine Queru
Option parsing now uses the parser API instead of a local parser. Code is now more compact. Description for -stateless-rpc and --advertise-refs come from the commit 42526b4 (Add stateless RPC options to upload-pack, receive-pack, 2009-10-30). Signed-off-by: Antoine Queru Signed-off-by: Matthieu

[PATCH v7 2/2] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

2016-05-23 Thread Elia Pinto
Permit the use of the GIT_TRACE_CURL environment variable calling the setup_curl_trace http.c helper routine. Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Jeff King Signed-off-by: Elia Pinto --- imap-send.c | 1 + 1 fi

[PATCH v7 0/2] Implement the GIT_TRACE_CURL environment variable

2016-05-23 Thread Elia Pinto
This is the seventh version but in reality is the complete rewriting of the patches discussed here (here called V1) $gmane/290520 $gmane/290521 *Changes from V6 ($gmane/295158) - updated with junio suggestions ($gmane/295207) * http.c: add redact_sensitive_header() helper * http.c: renamed

Re: Odd Difference Between Windows Git and Standard Git

2016-05-23 Thread Jon Forrest
On 5/23/2016 4:12 AM, Johannes Schindelin wrote: What we could do is to make the default config setting platform-dependent, a la CRLF_NATIVE. I imagine that we would want this for core.filemode, core.ignorecase and core.symlinks. What do you think? Would this change have any bad effects wh

[PATCH v7 1/2] http.c: implement the GIT_TRACE_CURL environment variable

2016-05-23 Thread Elia Pinto
Implement the GIT_TRACE_CURL environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis. Document the new

Re: [PATCH v6 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Christian Couder
On Mon, May 23, 2016 at 1:07 PM, Johannes Schindelin wrote: > > On Fri, 20 May 2016, Pranit Bauva wrote: > >> Frankly, I have no idea what you mean by libification but I will use >> error() since efforts for libification have already started. > > The term "libification" is frequently used in the G

Re: [PATCH v6 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Pranit Bauva
Hey Johannes, On Mon, May 23, 2016 at 4:37 PM, Johannes Schindelin wrote: > Hi Pranit, > > On Fri, 20 May 2016, Pranit Bauva wrote: > >> Frankly, I have no idea what you mean by libification but I will use >> error() since efforts for libification have already started. > > The term "libification"

[PATCH v7 1/3] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

2016-05-23 Thread Pranit Bauva
`--next-all` is meant to be used as a subcommand to support multiple "operation mode" though the current implementation does not contain any other subcommand along side with `--next-all` but further commits will include some more subcommands. Helped-by: Johannes Schindelin Mentored-by: Lars Schne

[PATCH v7 0/3] bisect--helper: check_term_format() & write_terms()

2016-05-23 Thread Pranit Bauva
Here is the link to v6[1]. I have kept bisect_log() and bisect_voc() on hold right now. It would be sent to the list whenever it is required which would probably be during the end. Important Changes wrt v6: * make the method write_terms() static * Use fprintf() instead of strbuf functions *

[PATCH v7 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Pranit Bauva
Reimplement the `write_terms` shell function in C and add a `write-terms` subcommand to `git bisect--helper` to call it from git-bisect.sh . Also remove the subcommand `--check-term-format` as it can now be called from inside the function write_terms() C implementation. Using `--write-terms` subco

[PATCH v7 2/3] bisect: rewrite `check_term_format` shell function in C

2016-05-23 Thread Pranit Bauva
Reimplement the `check_term_format` shell function in C and add a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--check-term-format` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more functions

Re: Odd Difference Between Windows Git and Standard Git

2016-05-23 Thread Johannes Schindelin
Hi Jon, On Mon, 23 May 2016, Jon Forrest wrote: > On 5/23/2016 4:12 AM, Johannes Schindelin wrote: > > > What we could do is to make the default config setting platform-dependent, > > a la CRLF_NATIVE. > > > > I imagine that we would want this for core.filemode, core.ignorecase and > > core.syml

[RFC] Asymetric implementation

2016-05-23 Thread Jordan DE GEA
Hi everyone, here is the fact, working with an asymetric workflow is not as easy as it could be. There are many options only setting by hands. And they are not easy to use, to understand and sometimes there are not suitable. This is an example of what git could do : Environment : - You have

Re: [PATCH v6 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Johannes Schindelin
Hi Christian, On Mon, 23 May 2016, Christian Couder wrote: > On Mon, May 23, 2016 at 1:07 PM, Johannes Schindelin > wrote: > > > > On Fri, 20 May 2016, Pranit Bauva wrote: > > > >> Frankly, I have no idea what you mean by libification but I will use > >> error() since efforts for libification ha

Re: [PATCH v7 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Eric Sunshine
On Mon, May 23, 2016 at 10:48 AM, Pranit Bauva wrote: > Reimplement the `write_terms` shell function in C and add a `write-terms` > subcommand to `git bisect--helper` to call it from git-bisect.sh . Also > remove the subcommand `--check-term-format` as it can now be called from > inside the functi

Re: [RFC/PATCH] Formatting variables in the documentation

2016-05-23 Thread Samuel GROOT
Some people have suggested to standardize documentation's formatting to make it more consistent. [1] 2015-04-29 20:13:53 GMT, Junio C Hamano wrote: Interesting. What I happen to use when populating the git-manpages repository would have wider impact to the users, as I hear that some (or many)

t4204-patch-id failures

2016-05-23 Thread Armin Kunaschik
Hello, I see 3 test failures in t4202: expecting success: test_patch_id_file_order irrelevant --stable --stable Already on 'same' cmp: cannot open patch-id_ordered-ordered-order---stable-irrelevant not ok 7 - file order is irrelevant with --stable # # test_patch_id_file_ord

Re: GIT_INDEX_FILE relative path breaks in subdir

2016-05-23 Thread Junio C Hamano
Joey Hess writes: > This seems to make it basically impossible for any program that wants to > use GIT_INDEX_FILE to use anything other than an absolute path; > there are too many configurations to keep straight that could change how > git interprets what should be a simple relative path to a fil

Re: Git reset --hard with staged changes

2016-05-23 Thread Junio C Hamano
Yotam Gingold writes: > --hard Resets the index and working tree. Any changes to tracked files in the > working tree since are discarded. > > This should be clarified to define what a tracked file is. A "tracked file" in that sentence is a file that is not untracked, I think. There are only fo

Re: git log: invert --author and --committer

2016-05-23 Thread Junio C Hamano
Per Cederqvist writes: > We have a repository that mostly contains configuration data. > This is updated by our continuous integration build system, but > every once in a while there are also more interesting commits > made by humans. > > For several years I have suffered in silence, wishing for

Re: GIT_INDEX_FILE relative path breaks in subdir

2016-05-23 Thread Joey Hess
Junio C Hamano wrote: > Joey Hess writes: > > > This seems to make it basically impossible for any program that wants to > > use GIT_INDEX_FILE to use anything other than an absolute path; > > there are too many configurations to keep straight that could change how > > git interprets what should

Re: [RFC/PATCH] Formatting variables in the documentation

2016-05-23 Thread Matthieu Moy
Samuel GROOT writes: > Since 2.8.3 was out recently, we could flip MAN_BOLD_LITERAL on by > default for this cycle to shake out problems as Jeff King suggested > [2]. 2.8.3 was a bufix release, and flipping a controversial flag should clearly not be done on a bugfix release. So, in this context,

Re: [PATCH v7 3/3] bisect--helper: `write_terms` shell function in C

2016-05-23 Thread Pranit Bauva
On Mon, May 23, 2016 at 9:31 PM, Eric Sunshine wrote: > On Mon, May 23, 2016 at 10:48 AM, Pranit Bauva wrote: >> Reimplement the `write_terms` shell function in C and add a `write-terms` >> subcommand to `git bisect--helper` to call it from git-bisect.sh . Also >> remove the subcommand `--check-t

Small rerere in rebase regression

2016-05-23 Thread Johannes Sixt
Even though I operate with jc/rerere-multi for some time now, I noticed this regression only recently. Watch out for the duplicated "Recorded preimage" message: gittest@side:1078> strace -f -o /tmp/git-rebase-conflict.strace git rebase -i master error: could not apply 59f92e0... side When you h

Re: [PATCH v3] upload-pack.c: use of parse-options API

2016-05-23 Thread Matthieu Moy
Antoine Queru writes: > Option parsing now uses the parser API instead of a local parser. > Code is now more compact. > Description for -stateless-rpc and --advertise-refs > come from the commit 42526b4 (Add stateless RPC options to upload-pack, > receive-pack, 2009-10-30). We usually wrap comm

[PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

2016-05-23 Thread Pranit Bauva
This is a follow up commit for f932729c (memoize common git-path "constant" files, 10-Aug-2015). It serves two purposes: 1. It reduces the number of calls to git_path() . 2. It serves the benefits of using GIT_PATH_FUNC as mentioned in the commit message of f932729c. Mentored-by: Lars S

Re: GIT_INDEX_FILE relative path breaks in subdir

2016-05-23 Thread Junio C Hamano
Joey Hess writes: > I feel it should be made consistently relative to top of work tree. > > Seems fairly unlikely that any scripts driving git rely on it > being relative to the pwd when GIT_WORK_TREE etc is set. Oh, I do agree that the current status may be a sign that nobody that is cautious t

Reviews for the first patches of pclouds/narrow-checkout

2016-05-23 Thread Stefan Beller
Hi, so I started looking into your narrow checkout branch and started reviewing the patches. Thanks for working on the narrow checkout! Reviewed-by: Stefan Beller (just asking for signoff) tree.c: break long lines read-cache: realign some statements read-cache: add sort_index() r

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-23 Thread Stefan Beller
On Sun, May 22, 2016 at 4:45 AM, Duy Nguyen wrote: > On Fri, May 20, 2016 at 4:25 AM, Stefan Beller wrote: >>> My take is to pretend sparse checkout does not exist at all and then >>> go from there ;-) > > Hehe.. shameless plug, narrow checkout [1] should be its great > successor where everything

Re: Odd Difference Between Windows Git and Standard Git

2016-05-23 Thread Junio C Hamano
Johannes Schindelin writes: >> Of course, if you are doing network mount between systems with and >> without filemode support, the result would depend on where you did >> the "git init", so that would not help. >> >> Which means that other probed things like symlink support and case >> sensitivi

Re: GIT_INDEX_FILE relative path breaks in subdir

2016-05-23 Thread Joey Hess
Junio C Hamano wrote: > I personally think that it would be OK as long as we do not change > behaviours for those who do not use core.worktree, $GIT_DIR and/or > $GIT_WORK_TREE and change behaviour for others to match that > behaviour, simply because the plain vanilla no-configuration would > be us

[BUG?] Spaces not allowed in directory names in .git/info/attributes

2016-05-23 Thread Nathan Collins
Example session: $ git init test.git Initialized empty Git repository in /tmp/test.git/.git/ $ cd test.git $ mkdir "dir name" $ touch dir\ name/file.txt $ echo "dir\\ name/file.txt -text -whitespace" >> .git/info/attributes $ git add dir\ name/file.txt name/file.txt

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

2016-05-23 Thread Junio C Hamano
Pranit Bauva writes: > This is a follow up commit for f932729c (memoize common git-path > "constant" files, 10-Aug-2015). > > It serves two purposes: > 1. It reduces the number of calls to git_path() . > > 2. It serves the benefits of using GIT_PATH_FUNC as mentioned in the > commit mess

Re: git log: invert --author and --committer

2016-05-23 Thread Junio C Hamano
Junio C Hamano writes: > Per Cederqvist writes: > >> git log --invert-grep --author cibot >... > Yeah, the author/committer search piggy-backs the more generic "grep > in the log" machinery, but it is quite hidden and the document > failed to tell the end users that is what is going on. Men

[PATCH v2 02/22] i18n: advice: mark string about detached head for translation

2016-05-23 Thread Vasco Almeida
Mark string with advice seen by the user when in detached head. Signed-off-by: Vasco Almeida --- advice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advice.c b/advice.c index 4dc5cf1..703a847 100644 --- a/advice.c +++ b/advice.c @@ -107,13 +107,13 @@ void NORETURN di

[PATCH v2 00/22] i18n and test updates

2016-05-23 Thread Vasco Almeida
Marks several messages for translation and updates tests to pass under GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others were updated to fit marks made by these patches. Patches that only touch test file refer to marks done in commits previous to these ones. This re-roll t

[PATCH v2 03/22] i18n: advice: internationalize message for conflicts

2016-05-23 Thread Vasco Almeida
Mark message for translation telling the user she has conflicts to resolve. Expose each particular use case, in order to enable translating entire sentences which would facilitate translating into other languages. Change "Pull" to lowercase to match other instances. Update test t5520-pull.sh, that

[PATCH v2 01/22] i18n: builtin/remote.c: fix mark for translation

2016-05-23 Thread Vasco Almeida
The second string inside _() was not being extracted for translation by xgettext, meaning that, although the string was passed to gettext, there was no translation available. Mark each individual string instead of marking the result of ternary if. Signed-off-by: Vasco Almeida --- builtin/remote

[PATCH v2 06/22] i18n: sequencer: mark string for translation

2016-05-23 Thread Vasco Almeida
Mark informative string ": fast-forward" for translation. Signed-off-by: Vasco Almeida --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 88a7c78..57b3671 100644 --- a/sequencer.c +++ b/sequencer.c @@ -225,7 +225,7 @@ static int fa

[PATCH v2 08/22] merge-octupus: use die shell function from git-sh-setup.sh

2016-05-23 Thread Vasco Almeida
Source git-sh-setup in order to use die shell function from git-sh-setup.sh library instead of using the one defined in git-merge-octopus.sh. Remove the former die function. Signed-off-by: Vasco Almeida --- git-merge-octopus.sh | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --g

[PATCH v2 10/22] i18n: rebase: mark placeholder for translation

2016-05-23 Thread Vasco Almeida
Mark placeholder "" in git-rebase.sh for translation. The string containing the named placeholder is passed to shell function error_on_missing_default_upstream in git-parse-remote.sh which uses it to display a command hint for the user. Signed-off-by: Vasco Almeida --- git-rebase.sh | 2 +- 1 fi

[PATCH v2 15/22] i18n: rebase-interactive: mark here-doc strings for translation

2016-05-23 Thread Vasco Almeida
Use pipe to send gettext output to git stripspace instead of the original method of using shell here-document, because command substitution '$(...)' would not take place inside the here-documents. The exception is the case of the last here-document redirecting to cat, in which commands substitution

[PATCH v2 12/22] t6030: update to use test_i18ncmp

2016-05-23 Thread Vasco Almeida
Since the git bisect output tested here is subject to translation, the helper function test_i18ncmp should be used over test_cmp. Signed-off-by: Vasco Almeida --- t/t6030-bisect-porcelain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t

[PATCH v2 11/22] i18n: bisect: simplify error message for i18n

2016-05-23 Thread Vasco Almeida
The message was not being extracted by xgettext, although it was marked for translation, seemingly because it contained a command substitution. Moreover, eval_gettext should be used instead of gettext for strings with substitution. See step 4. of section 15.5.2.1 Preparing Shell Scripts for Intern

[PATCH v2 04/22] i18n: transport: mark strings for translation

2016-05-23 Thread Vasco Almeida
Mark one printf string and one error string for translation. Signed-off-by: Vasco Almeida --- transport.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/transport.c b/transport.c index 095e61f..59b911e 100644 --- a/transport.c +++ b/transport.c @@ -59,

[PATCH v2 05/22] i18n: sequencer: mark entire sentences for translation

2016-05-23 Thread Vasco Almeida
Mark entire sentences of error message rather than assembling one using placeholders (e.g. "Cannot %s during a %s"). That would facilitate translation work because it is easier to translate a entire sentence than translating pieces. We would have better translations at the expense of source code v

[PATCH v2 09/22] i18n: rebase: fix marked string to use eval_gettext variant

2016-05-23 Thread Vasco Almeida
The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result. Signed-off-by: Vasco Almeida --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/gi

[PATCH v2 19/22] tests: unpack-trees: update to use test_i18n* functions

2016-05-23 Thread Vasco Almeida
Use functions test_i18ncmp and test_i18ngrep to successfully pass tests running under GETTEXT_POISON. The output strings compared to in these test were marked for translation in ed47fdf ("i18n: unpack-trees: mark strings for translation", 2016-04-09) and later improved in 2e3926b ("i18n: unpack-tr

[PATCH v2 16/22] i18n: rebase-interactive: mark comments of squash for translation

2016-05-23 Thread Vasco Almeida
Mark comment messages of squash/fixup file ($squash_msg) for translation. Helper functions this_nth_commit_message and skip_nth_commit_message replace the previous method of making the comment messages (such as "This is the 2nd commit message:") aided by nth_string helper function. This step was t

[PATCH v2 07/22] i18n: merge-octopus: mark messages for translation

2016-05-23 Thread Vasco Almeida
Mark messages in git-merge-octopus.sh for translation. Signed-off-by: Vasco Almeida --- git-merge-octopus.sh | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index dc2fd1b..89e967a 100755 --- a/git-merge-octopus.s

[PATCH v2 17/22] i18n: setup: mark strings for translation

2016-05-23 Thread Vasco Almeida
Update tests that compare the strings newly marked for translation to succeed when running under GETTEXT_POISON. Signed-off-by: Vasco Almeida --- setup.c| 16 t/t1506-rev-parse-diagnosis.sh | 2 +- t/t4208-log-magic-pathspec.sh | 4 ++-- 3 files change

[PATCH v2 21/22] t4153: fix negated test_i18ngrep call

2016-05-23 Thread Vasco Almeida
The function test_i18ngrep fakes success when run under GETTEXT_POISON. Hence, running in the following manner will always fail under gettext poison: ! test_i18ngrep expected actual Use correct syntax: test_i18ngrep ! expected actual For other instance of this issue see 41ca19b ("tests:

[PATCH v2 13/22] i18n: git-sh-setup.sh: mark strings for translation

2016-05-23 Thread Vasco Almeida
Positional arguments, such as $0, $1, etc, need to be stored on shell variables for use in translatable strings, according to gettext manual. Add git-sh-setup.sh to LOCALIZED_SH variable in Makefile to enable extraction of string marked for translation by xgettext. Although git-sh-setup.sh is a s

[PATCH v2 18/22] tests: use test_i18n* functions to suppress false positives

2016-05-23 Thread Vasco Almeida
The test functions test_i18ncmp and test_i18ngrep pretend success if run under GETTEXT_POISON. By using those functions to test output which is correctly marked as translatable, enables one to detect if the strings newly marked for translation are from plumbing output. If they are indeed from plumb

[PATCH v2 14/22] i18n: rebase-interactive: mark strings for translation

2016-05-23 Thread Vasco Almeida
Mark strings in git-rebase--interactive.sh for translation. There is no need to source git-sh-i18n since git-rebase.sh already does so. Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to enable extracting strings marked for translation by xgettext. Signed-off-by: Vasco Almeida

[PATCH v2 20/22] t9003: become resilient to GETTEXT_POISON

2016-05-23 Thread Vasco Almeida
The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON, because it's expecting to filter out the original output. Accommodate gettext poison case by also filtering out the default simulated output. Signed-off-by: Vasco Almeida --- That is a TAB between '^' and 'l' and likewise to

[PATCH v2 22/22] t5523: use test_i18ngrep for negation

2016-05-23 Thread Vasco Almeida
Replace the first form by the second one: ! grep expected actual test_i18ngrep ! expected actual The latter syntax is supported by test_i18ngrep defined in t/test-lib.sh. Although the test already passes whether GETTEXT_POSION is enabled, use the i18n grep variant for the sake of

Re: Git reset --hard with staged changes

2016-05-23 Thread Christian Couder
On Mon, May 23, 2016 at 2:55 AM, Yotam Gingold wrote: > Pierre-François CLEMENT gmail.com> writes: >> 2014-06-10 17:27 GMT+02:00 David Kastrup gnu.org>: >>> Pierre-François CLEMENT gmail.com> writes: >>> ... Hm I see. Even though the documentation doesn't make it very clear

[RFC-PATCH 0/2] send-email: new --quote-mail option

2016-05-23 Thread Tom Russello
Hello, With the current send-email command, you can send a series of patches "in reply to" an email. This patch adds a new option to `git send-email`, `--quote-mail=`, to quote an email in the cover letter in your series of patches. The "To", "Cc" and "Subject" fields will be filled appropriately

[RFC-PATCH 2/2] t9001: adding --quote-mail option test

2016-05-23 Thread Tom Russello
From: Tom Russello Tests if the "To", "Cc" and "Subject" fields are adequately filled and if the message is correctly quoted. Signed-off-by: Tom Russello Signed-off-by: Samuel Groot Signed-off-by: Matthieu Moy --- diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index b3355d2..bd

[RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-23 Thread Tom Russello
From: Tom Russello This new option takes an email message file, parses it, fills the "To", "Subject" and "Cc" fields appropriately and quote the message. This option involves the `--compose` mode to edit the cover letter quoting the given email. Signed-off-by: Tom Russello Signed-off-by: Samuel

Re: [RFC-PATCH 0/2] send-email: new --quote-mail option

2016-05-23 Thread Matthieu Moy
Tom Russello writes: > Hello, > > With the current send-email command, you can send a series of patches "in > reply > to" an email. > This patch adds a new option to `git send-email`, `--quote-mail=`, to I think the option name should be --quote-email. Even though "mail" usually means "email" f

Re: Small rerere in rebase regression

2016-05-23 Thread Junio C Hamano
Johannes Sixt writes: > I'm not sure whether the new behavior is a defect in rerere.c or a > consequence of the extra rerere call in interactive rebase... Interesting. When running an unnecessary "git rerere" (because it already was run and recorded the preimage), we used to be silent. With the

Re: GIT_INDEX_FILE relative path breaks in subdir

2016-05-23 Thread Junio C Hamano
Joey Hess writes: >> I am not sure if relative to PWD is useful. If it were relative to >> either the GIT_DIR or the GIT_WORK_TREE, i.e. a fixed point, then >> you can set and export GIT_INDEX_FILE and chdir around without >> having to adjust it. If it were relative to PWD, you would need to >>

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-23 Thread Eric Wong
Tom Russello wrote: > This new option takes an email message file, parses it, fills the "To", > "Subject" and "Cc" fields appropriately and quote the message. > This option involves the `--compose` mode to edit the cover letter quoting the > given email. Cool! There should probably be some help

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-23 Thread Matthieu Moy
Tom Russello writes: > This option involves the `--compose` mode to edit the cover letter quoting the s/involves/implies/ ? I don't think this is right: I often reply to an email with a single patch, for which it would clearly be overkill to have a cover-letter. Your --quote-mail does two thi

Re: [RFC-PATCH 0/2] send-email: new --quote-mail option

2016-05-23 Thread Samuel GROOT
On 05/23/2016 09:38 PM, Matthieu Moy wrote: Tom Russello writes: Hello, With the current send-email command, you can send a series of patches "in reply to" an email. This patch adds a new option to `git send-email`, `--quote-mail=`, to I think the option name should be --quote-email. Even

Re: [RFC-PATCH 2/2] t9001: adding --quote-mail option test

2016-05-23 Thread Matthieu Moy
> Subject: [RFC-PATCH 2/2] t9001: adding --quote-mail option test We write messages at imperative tone, hence s/adding/add/ Tom Russello writes: > From: Tom Russello Please use the same identity for email and commit to avoid this line. > --- > > > diff --git a/t/t9001-send-email.sh b/t/t9001

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-23 Thread Matthieu Moy
Eric Wong writes: > Tom Russello wrote: > >> +#Message body >> +while (<$fh>) { >> +#for files containing crlf line endings >> +$_=~ s/\r//g; >> +my $space=""; >> +if (/^[^>]/) { >> +$space = " "; >> +} >> +

Re: [BUG?] Spaces not allowed in directory names in .git/info/attributes

2016-05-23 Thread Junio C Hamano
Nathan Collins writes: > Example session: > > $ git init test.git > Initialized empty Git repository in /tmp/test.git/.git/ > $ cd test.git > $ mkdir "dir name" > $ touch dir\ name/file.txt > $ echo "dir\\ name/file.txt -text -whitespace" >> .git/info/attributes > $ gi

Re: t4204-patch-id failures

2016-05-23 Thread Junio C Hamano
Armin Kunaschik writes: > Essentially it's working like this: > > #!/bin/bash > > func1() { > name=${1} > echo "func1 name=$name" > } > > func2() { > name=${1} > echo "func2 name=$name" > func1 "ordered-$name" > echo "func2 again name=$name" > } >

Re: Git reset --hard with staged changes

2016-05-23 Thread Junio C Hamano
Christian Couder writes: >> This should be clarified to define what a tracked file is. I propose >> appending: >> >> A file is considered tracked if it exists in a prior commit or in the >> staging area. Note that a newly added file not in any prior commit will >> be >> removed. > >

Re: Confusing --graph --all output with detached branches

2016-05-23 Thread Junio C Hamano
Junio C Hamano writes: > Bjørnar Snoksrud writes: > >> .. which indicates that `foo` is contained within `bar`. Maybe >> >> * ff4265f (HEAD -> master) Merge branch 'bar' >> |\ >> | * 0bbc311 (bar) 5 >> | * b1c9c49 4 >> | >> | * ce053f9 (foo) 3 >> |/ >> * 8b62de9 2 >> * cb7e7e2 1 >> >> ..

Re: git log: invert --author and --committer

2016-05-23 Thread Per Cederqvist
On Mon, May 23, 2016 at 9:26 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Per Cederqvist writes: >> >>> git log --invert-grep --author cibot >>... >> Yeah, the author/committer search piggy-backs the more generic "grep >> in the log" machinery, but it is quite hidden and the docum

Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-23 Thread Junio C Hamano
Lars Schneider writes: >> On 19 May 2016, at 19:11, Junio C Hamano wrote: >> >> Eric Wong writes: >> >>> Anyways, how about making the tests run on separate ports and >>> not worry about serializing them at all? >> >> Yeah, that does sound like a more sensible approach. > > Makes sense. Howe

Re: git log: invert --author and --committer

2016-05-23 Thread Junio C Hamano
Per Cederqvist writes: > "can also be used to affect", right? (I think the word "to" is missing.) Correct. > That wording would however make me assume that --all-match could also > be used, so that > > git log --all-match --author ceder --author cibot > > would list nothing (since there are

Re: Small rerere in rebase regression

2016-05-23 Thread Johannes Sixt
Am 23.05.2016 um 21:43 schrieb Junio C Hamano: Johannes Sixt writes: I'm not sure whether the new behavior is a defect in rerere.c or a consequence of the extra rerere call in interactive rebase... Interesting. When running an unnecessary "git rerere" (because it already was run and recorde

Re: [PATCH v7 1/9] connect: document why we sometimes call get_port after get_host_and_port

2016-05-23 Thread Junio C Hamano
Torsten Bögershausen writes: get_host_and_port(&ssh_host, &port); +/* get_host_and_port may not return a port even when + * there is one: In the [host:port]:path case, + * get_host_and_port i

Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-23 Thread Eric Wong
Junio C Hamano wrote: > Lars Schneider writes: > >> On 19 May 2016, at 19:11, Junio C Hamano wrote: > >> Eric Wong writes: > >> > >>> Anyways, how about making the tests run on separate ports and > >>> not worry about serializing them at all? > >> > >> Yeah, that does sound like a more sensib

Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126

2016-05-23 Thread Junio C Hamano
Eric Wong writes: > Junio C Hamano wrote: >> Lars Schneider writes: >> >> On 19 May 2016, at 19:11, Junio C Hamano wrote: >> >> Eric Wong writes: >> >> >> >>> Anyways, how about making the tests run on separate ports and >> >>> not worry about serializing them at all? >> >> >> >> Yeah, that

Re: git log: invert --author and --committer

2016-05-23 Thread Junio C Hamano
Per Cederqvist writes: > I think it does make sense to document this with the --author/--committer > options. > > That wording would however make me assume that --all-match could also > be used, so that > > git log --all-match --author ceder --author cibot > > would list nothing (since there

Re: [PATCH v7 1/9] connect: document why we sometimes call get_port after get_host_and_port

2016-05-23 Thread Mike Hommey
On Mon, May 23, 2016 at 02:30:57PM -0700, Junio C Hamano wrote: > Torsten Bögershausen writes: > > get_host_and_port(&ssh_host, &port); > + /* get_host_and_port may not return a port > even when > + * ther

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

2016-05-23 Thread Samuel GROOT
On 05/23/2016 10:07 PM, Matthieu Moy wrote: Eric Wong writes: Tom Russello wrote: + #Message body + while (<$fh>) { + #for files containing crlf line endings + $_=~ s/\r//g; + my $space=""; + if (/^[^>]/) { +

Re: Small rerere in rebase regression

2016-05-23 Thread Junio C Hamano
Johannes Sixt writes: > I also come to the conclusion that die_with_patch shouldn't have to > have a call to "git rerere". die_with_patch can be called after "git > cherry-pick", "git merge", "git commit", all of which have their own > rerere() invocation. > > However, calling "git rerere" after

Re: t4204-patch-id failures

2016-05-23 Thread Junio C Hamano
Junio C Hamano writes: > Both bash and dash seem to run the func1 in the downstream of the > pipe in a separate process, and $name used in "func2 again" is not > affected. But it seems that ksh93 behaves differently (I do not > have access to ksh88). > > An obvious workaround is to replace your

Please add a git config option to make --show-signature the default

2016-05-23 Thread Austin English
As stated in title, I'd like to see an option to enable GPG signature by default. I find this feature very useful and would like to enable it by default on my machine, without having to resort to an alias in my ~/.bash_rc. I asked in #git and checked the git repo, but I didn't see an option listed

Re: t4204-patch-id failures

2016-05-23 Thread Armin Kunaschik
On Tue, May 24, 2016 at 12:23 AM, Junio C Hamano wrote: > Junio C Hamano writes: > Having said all that, this illustrates the root cause of different > behaviours better, but it is harder to reason about than simply > changing the variable name used in this shell function. POSIX reads > a bit f

[ANNOUNCE] Git v2.9.0-rc0

2016-05-23 Thread Junio C Hamano
An early preview release Git v2.9.0-rc0 is now available for testing at the usual places. It is comprised of 443 non-merge commits since v2.8.0, contributed by 60 people, 24 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following

Typo spotted in archive-tar.c

2016-05-23 Thread Green, Paul
While examining (relatively) recent changes to git, my eye happened to notice the following inconsistency on line 184 of the current version of archive-tar.c. -sprintf(header->chksum, "%07o", ustar_header_chksum(header)); +snprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_

Re: [BUG?] Spaces not allowed in directory names in .git/info/attributes

2016-05-23 Thread Duy Nguyen
On Tue, May 24, 2016 at 3:30 AM, Junio C Hamano wrote: > Nathan Collins writes: > >> Example session: >> >> $ git init test.git >> Initialized empty Git repository in /tmp/test.git/.git/ >> $ cd test.git >> $ mkdir "dir name" >> $ touch dir\ name/file.txt >> $ echo "dir\\

Re: [PATCHv8 0/5] pathspec magic extension to search for attributes

2016-05-23 Thread Duy Nguyen
On Tue, May 24, 2016 at 1:49 AM, Stefan Beller wrote: > On Sun, May 22, 2016 at 4:45 AM, Duy Nguyen wrote: >> On Fri, May 20, 2016 at 4:25 AM, Stefan Beller wrote: My take is to pretend sparse checkout does not exist at all and then go from there ;-) >> >> Hehe.. shameless plug, narrow

[PATCHv2 0/2] Persistent submodule pathspec specification

2016-05-23 Thread Stefan Beller
Changes since v1: * fixed a broken && chain in a subshell for testing, as pointed out by Eric! This was part of the former series 'submodule groups'. However the labeling was ripped out and goes in its own series sb/pathspec-label. First we introduce a switch `--init-default-path` for `git submo

  1   2   >