Re: [RFC/PATCH] WIP: add deprecation & experimental process/interface

2017-05-27 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > The plan, subject to RFC feedback is to: > > * Add a new config variable `core.version`. E.g. `core.version = >2.14.0` With this the user can specify that they'd like >new/experimental features introduced in that version (and below),

Re: mergetool: what to do about deleting precious files?

2017-05-27 Thread Junio C Hamano
"Philip Oakley" writes: > The git book [1] and a few blog posts [2] show how to preserve files which > are in the current branch against changes that are on the branch being > merged in. > > e.g. (from [2]) > > echo ' merge=ours' >> .gitattributes && # commit > git config

Re: [RFC/PATCH] recognize pathspec magic without "--" disambiguation

2017-05-27 Thread Junio C Hamano
Jeff King writes: > Yeah. That's a good reason not to use ":/" without a disambiguating "--" > (which _does_ work, even without my series, because check_filename() > does specific path-matching). At best, you pay for a complete useless > history traversal before the command

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-27 Thread Junio C Hamano
"Philip Oakley" writes: > However given the discussion about an unborn HEAD, the option here > would be to also pass the NULL sha for the symref and then add the > annotation 'HEAD' after an extra \0, in the same way that an active > symref could be annotated with the

Re: git-2.13.0: log --date=format:%z not working

2017-05-27 Thread Jeff King
On Sat, May 27, 2017 at 06:57:08PM +0200, Ævar Arnfjörð Bjarmason wrote: > There's another test which breaks if we just s/gmtime/localtime/g. As > far as I can tell to make the non-local case work we'd need to do a > whole dance where we set the TZ variable to e.g. UTC$offset, then call >

Re: [GSoC][PATCH v5 3/3] submodule: port subcommand foreach from shell to C

2017-05-27 Thread Johannes Sixt
Am 27.05.2017 um 16:06 schrieb Ramsay Jones: To be more explicit, last Sunday I hacked into t7407 to show an example failure on cygwin (see patch below), but it passes on both Linux (expected) and cygwin! :( Perhaps you can see what I'm doing wrong? As long as the git.exe you are using here is

Re: [RFC/PATCH] recognize pathspec magic without "--" disambiguation

2017-05-27 Thread Jeff King
On Sat, May 27, 2017 at 11:54:07AM +0200, Ævar Arnfjörð Bjarmason wrote: > On Thu, May 25, 2017 at 5:27 PM, Jeff King wrote: > > git log :/foo.*bar > > Another option would be to deprecate the :/rx syntax over some period > in favor of ^{/rx}. Yeah, the latter is more

GREETINGS

2017-05-27 Thread mis.sbort...@ono.com
GREETINGS, I AM BORTE ,I WAS DIAGNOSE WITH OVARIAN CANCER,WHICH DOCTORS HAVE CONFIRMED THAT I HAVE ONLY FEW WEEKS TO LIVE, SO I HAVE DECIDED TO DONATE EVERYTHING I HAVE TO THE ORPHANAGE AND THE POOR WIDOWS THROUGH YOU IN YOUR AREA.PLEASE KINDLY REPLY ME ONLY ON MY EMAIL ADDRES HERE

Good Morning ,Am Lindsey, I have a friendly feeling, And decide to leave a message for you, I know you're many miles away.

2017-05-27 Thread Lindsey

Re: git-2.13.0: log --date=format:%z not working

2017-05-27 Thread Ævar Arnfjörð Bjarmason
On Fri, May 26, 2017 at 8:33 PM, Ulrich Mueller wrote: > The following commands work as expected (using commit b06d364310 > in the git://git.kernel.org/pub/scm/git/git.git repo as test case): > > $ export TZ=Europe/Berlin > $ git --no-pager log -1 --pretty="%ad" --date=iso

Re: [PATCH v4 00/10] The final building block for a faster rebase -i

2017-05-27 Thread René Scharfe
Am 26.05.2017 um 05:15 schrieb Liam Beguin: I tried to time the execution on an interactive rebase (on Linux) but I did not notice a significant change in speed. Do we have a way to measure performance / speed changes between version? Well, there's performance test script

Re: [GSoC][PATCH v5 3/3] submodule: port subcommand foreach from shell to C

2017-05-27 Thread Ramsay Jones
On 27/05/17 02:20, Ramsay Jones wrote: > > > On 26/05/17 22:54, Johannes Sixt wrote: >> Am 26.05.2017 um 17:17 schrieb Prathamesh Chavan: >>> +argv_array_pushf(_array, "path=%s", list_item->name); >> >> Not good! On Windows, environment variables are case insensitive. The >> environment

git push recurse.submodules behavior changed in 2.13

2017-05-27 Thread John Shahid
Hi all, It looks like the git push recurse-submodules behavior has changed. Currently with 2.13 you cannot run "git push --recurse-submodules=on-demand" if the parent repo is on a different branch than the sub repos, e.g. parent repo is on "develop" and sub-repo on "master". I created a test that

[RFC/PATCH] WIP: add deprecation & experimental process/interface

2017-05-27 Thread Ævar Arnfjörð Bjarmason
This is the WIP start of a deprecation & experimental interface to git. The goal is to formalize the workflow around deprecating features, or around introducing new experimental features. This is much more idea than code at the moment, but included is an example showing how :/ might be

mergetool: what to do about deleting precious files?

2017-05-27 Thread Philip Oakley
The git book [1] and a few blog posts [2] show how to preserve files which are in the current branch against changes that are on the branch being merged in. e.g. (from [2]) echo ' merge=ours' >> .gitattributes && # commit git config --global merge.ours.driver true (test) $ git checkout demo

Re: [RFC/PATCH] recognize pathspec magic without "--" disambiguation

2017-05-27 Thread Ævar Arnfjörð Bjarmason
On Thu, May 25, 2017 at 5:27 PM, Jeff King wrote: > git log :/foo.*bar Another option would be to deprecate the :/rx syntax over some period in favor of ^{/rx}. I think it's too ugly to live, and really useless. It's equivalent to "--grep= --all". Does anyone use this and

[PATCH] wildmatch test: cover a blind spot in "/" matching

2017-05-27 Thread Ævar Arnfjörð Bjarmason
Add a test which covers a blindspot in how these tests should assert that negated character classes are allowed or not allowed to match "/" in certain circumstances. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3070-wildmatch.sh | 2 ++ 1 file changed, 2 insertions(+) diff

Re: Feature request: "git status" highlights files that are larger than 500kb.

2017-05-27 Thread Ævar Arnfjörð Bjarmason
On Fri, May 26, 2017 at 2:24 AM, Zhomart Mukhamejanov wrote: > So it will be easy to track that we don't accidentally commit huge files. Isn't doing this via a pre-commit or pre-receive hook both more reliable & actually a 1=1 mapping to what you really care about?

Odp: Re: Dzial Kredytowy

2017-05-27 Thread BSN Capital
Witam, Czy potrzebujesz zatwierdzony biznes i prywatnego kredytu / Finansowanie w maksymalnej wysokosci 3% w skali roku? Skontaktuj sie z nami po wiecej szczególów w razie zainteresowania. Dziekuje. BSN Capital Partners Ltd (London) Zarzadzanie. -- Angielska wersja

Re: [PATCH 1/1] diff.c: color moved lines differently

2017-05-27 Thread Philip Oakley
a couple of mispellings in the doc parts: s/on location/one location/ [code not checked] - Original Message - From: "Stefan Beller" Subject: [PATCH 1/1] diff.c: color moved lines differently When a patch consists mostly of moving blocks of code around, it can be

Re: [PATCH v2 0/6] Fast git status via a file system watcher

2017-05-27 Thread Christian Couder
On Thu, May 25, 2017 at 3:55 PM, Ben Peart wrote: > > > On 5/24/2017 6:54 AM, Christian Couder wrote: >>> >>> Design >>> ~~ >>> >>> A new git hook (query-fsmonitor) must exist and be enabled >>> (core.fsmonitor=true) that takes a time_t formatted as a string and >>>