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

2017-05-31 Thread Christian Couder
Yeah, they could be encoded in the integration script, but it could be better if it was possible to just configure a generic command line. For example if the directory that should be watched for filesystem changes could be passed as well as the time since the last changes,

Re: How can I make a best dissertation paper?

2017-05-31 Thread writing2854
Writing Invaders Provide custom essay writing help, dissertation writing services Assignments , Essay Writing

Re: How can I make a best dissertation paper?

2017-05-31 Thread writing2854
Writing Invaders Provide custom essay writing help, dissertation writing services Assignments , Essay Writing

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

2017-05-31 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: >>> >>> A new git hook (query-fsmonitor) must exist and be enabled >>> (core.fsmonitor=true) that takes a time_t formatted as a string and >>> outputs to stdout all files that

Re: [PATCHv4 1/2] clone: respect additional configured fetch refspecs during initial fetch

2017-05-31 Thread SZEDER Gábor
On Wed, May 31, 2017 at 6:23 AM, Jeff King wrote: > On Tue, May 30, 2017 at 09:12:43AM +0200, SZEDER Gábor wrote: > >> diff --git a/remote.c b/remote.c >> index ad6c5424e..b8fd09dc9 100644 >> --- a/remote.c >> +++ b/remote.c >> @@ -626,6 +626,19 @@ struct refspec

Re: [PATCHv4 2/2] Documentation/clone: document ignored configuration variables

2017-05-31 Thread SZEDER Gábor
On Tue, May 30, 2017 at 11:01 AM, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 30, 2017 at 9:12 AM, SZEDER Gábor wrote: >> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt >> index ec41d3d69..4f1e7d4ba 100644 >> ---

Re: git push recurse.submodules behavior changed in 2.13

2017-05-31 Thread John Shahid
Hi Jonathan. Thanks a lot for the detailed and interesting response. I included my comments/replies inline. tl;dr; 1. I love the idea of having tools treat the repo as a unit. 2. I think propagating the refspec when no refspec is passed on the CLI is very surprising action that should be

[PATCH] docs: fix literal quoted spaces

2017-05-31 Thread Adam Dinwoodie
When compiling the documentation, asciidoc thinks a backtick surrounded by whitespace shouldn't be interpreted as marking the start or end of a literal. In most cases, that's useful behaviour, but in the git-pull documentation the space is clearly intended to be part of the monospace formatted

bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-05-31 Thread Anthony Sottile
Given the following commits: ``` asottile@asottile-VirtualBox:/tmp$ git init test Initialized empty Git repository in /tmp/test/.git/ asottile@asottile-VirtualBox:/tmp$ cd test/ asottile@asottile-VirtualBox:/tmp/test$ GIT_COMMITTER_EMAIL=f...@example.com GIT_AUTHOR_EMAIL=f...@example.com git

Re: [PATCH] docs: fix literal quoted spaces

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 04:06:24PM +0100, Adam Dinwoodie wrote: > When compiling the documentation, asciidoc thinks a backtick surrounded > by whitespace shouldn't be interpreted as marking the start or end of a > literal. In most cases, that's useful behaviour, but in the git-pull >

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 05:27:21PM +0200, Johannes Schindelin wrote: > > My intent in putting it into the actual git binary was that it could > > also be useful for collecting build-time knobs from users (who may be > > using a binary package). Like: > > > >

[PATCH 2/2] rebase: turn on progress option by default for format-patch

2017-05-31 Thread Kevin Willford
This change passes the progress option of format-patch by default and passes the -q --quiet option through to the format-patch call so that it is respected as well. Signed-off-by: Kevin Willford --- git-rebase--am.sh | 5 +++-- git-rebase.sh | 2 ++ 2 files changed, 5

[PATCH 0/2] Add progress to format-patch and rebase

2017-05-31 Thread Kevin Willford
This patch series is to add progress for the user when generating patches in format-patch. This is to aid the user when performing large rebases and have some indication to the user that progress is being made. These patches just add the normal progress indication when generating patches and

[PATCH 1/2] format-patch: have progress option while generating patches

2017-05-31 Thread Kevin Willford
When generating patches for the rebase command if the user does not realize the branch they are rebasing onto is thousands of commits different there is no progress indication after initial rewinding message. This patch allows a progress option to be passed to format-patch so that the user can be

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

2017-05-31 Thread Ben Peart
On 5/31/2017 12:33 AM, Christian Couder wrote: +test_expect_success 'refresh_index() invalidates fsmonitor cache' ' + git config core.fsmonitor true && + git config core.untrackedcache true && + clean_repo && + git status && + test_path_is_missing marker && +

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

2017-05-31 Thread Johannes Schindelin
Hi Peff, On Wed, 31 May 2017, Jeff King wrote: > On Wed, May 31, 2017 at 05:27:21PM +0200, Johannes Schindelin wrote: > > > > My intent in putting it into the actual git binary was that it could > > > also be useful for collecting build-time knobs from users (who may be > > > using a binary

Re: [PATCH] docs/config: mention protocol implications of url.insteadOf

2017-05-31 Thread Brandon Williams
On 05/31, Jeff King wrote: > On Fri, May 26, 2017 at 11:22:37AM -0500, Elliott Cable wrote: > > > 1. Most simply, better documentation: mention `GIT_PROTOCOL_FROM_USER` > >explicitly in the documentation of/near `insteadOf`, most > >particularly in the README for

Re: [PATCH v2] pull: ff --rebase --autostash works in dirty repo

2017-05-31 Thread Junio C Hamano
Tyler Brazier writes: > When `git pull --rebase --autostash` in a dirty repository resulted in a > fast-forward, nothing was being autostashed and the pull failed. This > was due to a shortcut to avoid running rebase when we can fast-forward, > but autostash is ignored on

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-05-31 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > $ git log --grep=bar --invert-grep --author=Ævar --pretty=format:%an > -100 origin/pu |sort|uniq -c|sort -nr > 78 Junio C Hamano > 14 Jeff King > 2 Andreas Heiduk > 1 Sahil Dua > 1 Rikard Falkeborn > 1 Johannes

[PATCH/RFC v2 2/6] branch: add copy branch option

2017-05-31 Thread Sahil Dua
Adds copy branch option available using -c or -C (forcefully). Includes a lot of function renames and their signature changes in order to introduce a new function parameter - flag 'copy' which determines whether those functions should do operation copy or move. Additionally, this changes a lot

[PATCH/RFC v2 4/6] config: modify function signature to include copy argument

2017-05-31 Thread Sahil Dua
Changed git_config_rename_section to git_config_copy_or_rename_section which will now accept another argument flag "copy" which will determine if the function will copy the config section or just rename it. Again, this includes changes at a lot of unrelated other places wherever the renamed and

[PATCH/RFC v2 1/6] branch: add tests for new copy branch feature

2017-05-31 Thread Sahil Dua
Adds a few basic tests for getting any suggestions/feedback about expected behavior for this new feature. Aim is to have an option -c for copying a branch just like -m option for renaming a branch. Signed-off-by: Sahil Dua --- t/t3200-branch.sh | 53

[PATCH/RFC v2 6/6] branch: don't copy or rename config when same branch name

2017-05-31 Thread Sahil Dua
It doesn't make sense to trigger config section copy or rename method if both the branch names are same. For example - git branch -C a a In such a case, it shouldn't try to copy or rename the git config section. Signed-off-by: Sahil Dua --- builtin/branch.c | 2 +- 1

[PATCH/RFC v2 3/6] config: abstract out create section from key logic

2017-05-31 Thread Sahil Dua
Abstracts out the logic for creating string buffer from given key for example - 'branch.b' and returns '[branch "b"]'. We want to keep the original config section intact in case of copy operation. For this we need to fetch the section with updated new branch name so that we can write that to the

[PATCH v2] send-email: Net::SMTP::starttls was introduced in v2.34 (Re: [BUG] git-send-email broken: Can't locate object method "starttls")

2017-05-31 Thread Jonathan Nieder
Subject: send-email: Net::SMTP::starttls was introduced in v2.34 We cannot rely on the starttls method being present in Net::SMTP until c274b798e6881a941d941808c6d89966975cb8c8 (Merge branch 'ipv6_ssl' of https://github.com/noxxi/perl-libnet into noxxi-ipv6_ssl, 2014-06-02), which set the module

Re: [PATCH 1/2] format-patch: have progress option while generating patches

2017-05-31 Thread Junio C Hamano
Jeff King writes: > As I said above, I think I'd prefer it to require "--progress", as > format-patch is quite often used as plumbing. Yes, that sounds sensible. Initially, my reaction was "Why do we even need --progress for format-patch, when it gives one-line per patch output

[PATCH] diff.c: color moved lines differently

2017-05-31 Thread Stefan Beller
When a patch consists mostly of moving blocks of code around, it can be quite tedious to ensure that the blocks are moved verbatim, and not undesirably modified in the move. To that end, color blocks that are moved within the same patch differently. For example (OM, del, add, and NM are different

Re: [PATCH] docs: fix literal quoted spaces

2017-05-31 Thread Junio C Hamano
Jeff King writes: > On Wed, May 31, 2017 at 04:06:24PM +0100, Adam Dinwoodie wrote: > >> When compiling the documentation, asciidoc thinks a backtick surrounded >> by whitespace shouldn't be interpreted as marking the start or end of a >> literal. In most cases, that's useful

[PATCH/RFC v2 5/6] config: add copy config section logic

2017-05-31 Thread Sahil Dua
Adds implementation for copying the config section while copying a branch. While we're parsing the config file, we need to make sure we start copying the config section once we find the matching block for our branch1 (for example when running 'git branch -c branch1 branch2'). There is one flag

[PATCHv3 3/4] builtin/push.c: respect 'submodule.recurse' option

2017-05-31 Thread Stefan Beller
The closest mapping from the boolean 'submodule.recurse' set to "yes" to the variety of submodule push modes is "on-demand", so implement that. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/push.c | 4

[PATCHv3 1/4] Introduce 'submodule.recurse' option for worktree manipulators

2017-05-31 Thread Stefan Beller
Any command that understands '--recurse-submodules' can have its default changed to true, by setting the new 'submodule.recurse' option. This patch includes read-tree/checkout/reset for working tree manipulating commands. Later patches will cover other commands. Signed-off-by: Stefan Beller

[PATCHv3 0/4] A reroll of sb/submodule-blanket-recursive

2017-05-31 Thread Stefan Beller
v3: * rerolling only the top-4 patches of sb/submodule-blanket-recursive. (base: 1d789d089280539ca39b83aabb67860929d39b75) * fixes function declarations that should be static, thanks Ramsay! v2: * A reroll of sb/submodule-blanket-recursive. * This requires ab/grep-preparatory-cleanup * It

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

2017-05-31 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Mon, May 29, 2017 at 8:23 AM, Junio C Hamano wrote: >> * ab/pcre-v2 (2017-05-26) 7 commits >> - grep: add support for PCRE v2 >> - grep: un-break building with PCRE < 8.20 >> - grep: un-break building with PCRE < 8.32

Re: [PATCH v3 4/4] stash: implement builtin stash

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 08:29:43PM -0700, Joel Teichroeb wrote: > I'm running into a lot of trouble using argv_array_clear. It seems > that some of the builtin git cmd functions move the parameters around, > and write new pointers to argv. There's three options I have now, and > I'm not sure

[PATCHv3 2/4] builtin/grep.c: respect 'submodule.recurse' option

2017-05-31 Thread Stefan Beller
In builtin/grep.c we parse the config before evaluating the command line options. This makes the task of teaching grep to respect the new config option 'submodule.recurse' very easy by just parsing that option. As an alternative I had implemented a similar structure to treat submodules as the

[PATCHv3 4/4] builtin/fetch.c: respect 'submodule.recurse' option

2017-05-31 Thread Stefan Beller
Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/fetch.c | 7 +++ t/t5526-fetch-submodules.sh | 10 ++ 2 files changed, 17 insertions(+) diff --git a/builtin/fetch.c b/builtin/fetch.c index

Re: [PATCH/RFC v2 2/6] branch: add copy branch option

2017-05-31 Thread Junio C Hamano
Sahil Dua writes: > Adds copy branch option available using -c or -C (forcefully). > > Includes a lot of function renames and their signature changes in order > to introduce a new function parameter - flag 'copy' which determines > whether those functions should do

Re: [PATCH 1/3] rebase -i: Add test for reflog message

2017-05-31 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > Check that the reflog message written to the branch reflog when the > rebase is completed is correct. This checks for regressions for the > fix in commit > 4ab867b8fc rebase -i: fix reflog

Re: [PATCH 2/3] rebase: Add tests for console output

2017-05-31 Thread Junio C Hamano
Phillip Wood writes: > On 31/05/17 11:42, Phillip Wood wrote: >> From: Phillip Wood >> >> Check the console output when using --autostash and the stash applies >> cleanly is what we expect. To avoid this test depending on commit and >>

[PATCH v3] pull: ff --rebase --autostash works in dirty repo

2017-05-31 Thread Tyler Brazier
When `git pull --rebase --autostash` in a dirty repository resulted in a fast-forward, nothing was being autostashed and the pull failed. This was due to a shortcut to avoid running rebase when we can fast-forward, but autostash is ignored on that codepath. Now we will only take the shortcut if

Re: [PATCH 8/8] t0012: test "-h" with builtins

2017-05-31 Thread Junio C Hamano
Jeff King writes: > Anyway, the problem is sk/dash-is-previous, specifically fc5684b47 > (revision.c: args starting with "-" might be a revision, 2017-02-25). It > looks like the revision parser used to just bail on "-h", because > revision.c would say "I don't recognize this" and

Re: [Bug] git branch -v has problems with carriage returns

2017-05-31 Thread Junio C Hamano
Atousa Duprat writes: > Here is my first attempt at fixing the issue. > > There are two problems in ref-filter.c: > > First, copy_subject() has been modified to turn '\n' into a space and > every other ascii control character to be ignored. > > Second, find_subpos() doesn't

Re: [PATCH v3 4/4] stash: implement builtin stash

2017-05-31 Thread Joel Teichroeb
I'm running into a lot of trouble using argv_array_clear. It seems that some of the builtin git cmd functions move the parameters around, and write new pointers to argv. There's three options I have now, and I'm not sure which is the best one. 1. Fix all the builtin cmd functions that I use to

Re: [PATCH 8/8] t0012: test "-h" with builtins

2017-05-31 Thread Junio C Hamano
Junio C Hamano writes: > Heh, I found another ;-) > > 95e98cd9 ("revision.c: use refs_for_each*() instead of > for_each_*_submodule()", 2017-04-19), which is in the middle of > Duy's nd/prune-in-worktree series, does this: > ... > when jk/consistent-h is merged into it and

Re: [PATCH 8/8] t0012: test "-h" with builtins

2017-05-31 Thread Junio C Hamano
Junio C Hamano writes: > For now, I will mix this in when queuing the whole thing in 'pu', as > I hate to push out something that does not even work for me to the > general public. > > -- >8 -- > Subject: [PATCH] diff- and log- family: handle "git cmd -h" early > ... And

Re: [PATCH 8/8] t0012: test "-h" with builtins

2017-05-31 Thread Jeff King
On Thu, Jun 01, 2017 at 01:17:55PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > Anyway, the problem is sk/dash-is-previous, specifically fc5684b47 > > (revision.c: args starting with "-" might be a revision, 2017-02-25). It > > looks like the revision parser used to

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

2017-05-31 Thread Stefan Beller
On Wed, May 31, 2017 at 12:46 PM, Kevin Willford wrote: > > I thought about that and certainly could do it but I have found it nice to > have the number of patches that are generated in the output even for a small > number or commits. For example when I run a `git

RE: [PATCH 2/2] rebase: turn on progress option by default for format-patch

2017-05-31 Thread Kevin Willford
> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Wednesday, May 31, 2017 1:09 PM > To: Kevin Willford > Cc: git@vger.kernel.org; Junio C Hamano ; Kevin > Willford > Subject: Re: [PATCH 2/2]

Re: Coloring

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 11:33:31AM -0700, Irving Rabin wrote: > Specifically, if the field is supposed to be white, it doesn't mean it > should be literally 0xFF. It should be the color that I have > configured as White color for my console emulator. > > I like light-screen terminals, and I

Re: Coloring

2017-05-31 Thread Irving Rabin
Thanks Jeff, my problem has been resolved by Samuel Lijin. My terminal settings didn't set bold which remained white. I fixed it and my problem was gone! This issue is closed. Is there any way to retire it? Irving Rabin Software Developer @Edmodo 408-242-1299 On Wed, May 31, 2017 at 2:04 PM,

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 07:51:20PM +0200, Ævar Arnfjörð Bjarmason wrote: > Thanks both. It makes sense to discard this patch. > > I wasn't sure whether anyone really cared about this, and thought a > patch was a better starting point of discussion. I will never complain about somebody starting

Re: [Bug] git branch -v has problems with carriage returns

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:32 PM, Atousa Duprat wrote: > Here is my first attempt at fixing the issue. Cool you're looking into this. :) > > There are two problems in ref-filter.c: > > First, copy_subject() has been modified to turn '\n' into a space and > every other ascii

Coloring

2017-05-31 Thread Irving Rabin
Folks, I am reporting an issue with coloring of the output of Git commands, like status, diff, etc. Specifically, if the field is supposed to be white, it doesn't mean it should be literally 0xFF. It should be the color that I have configured as White color for my console emulator. I like

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

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Tue, May 30, 2017 at 10:22 PM, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 30, 2017 at 5:44 PM, Johannes Schindelin > wrote: >> pu does not build for me: >> >> 2017-05-30T11:38:50.0089681Z libgit.a(grep.o): In function `pcre1match': >>

Re: [PATCH 2/3] rebase: Add tests for console output

2017-05-31 Thread Phillip Wood
On 31/05/17 11:42, Phillip Wood wrote: From: Phillip Wood Check the console output when using --autostash and the stash applies cleanly is what we expect. To avoid this test depending on commit and stash hashes it uses sed to replace them with XXX. The sed script

Git Daemon on Windows fatal error.

2017-05-31 Thread Hector Santos
Hi, I am relatively new to GIT (coming from CVS and SVN) and I am trying to setup "Git Daemon" on windows. I got it working for Local network communications: d:\local\wc5\testgit>git clone git://localhost/http clone10 Cloning into 'clone10'... remote: Counting objects: 526, done. remote:

Re: [PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

2017-05-31 Thread Stefan Beller
> @@ -505,16 +505,17 @@ static int merge_changes(struct notes_merge_options *o, > } > > static int merge_from_diffs(struct notes_merge_options *o, > - const unsigned char *base, > - const unsigned char *local, > -

Re: [PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote: > > Signed-off-by: Brandon Williams > --- > combine-diff.c | 10 +- > diff.h | 4 ++-- > tree-diff.c| 63 > +- > 3 files

Re: [PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:30 AM, Brandon Williams wrote: > Convert notes_merge and notes_merge_commit to use struct object_id. > > > Signed-off-by: Brandon Williams spurious new line before sign off.

Re: bug: `git log --grep ... --invert-grep --author=...` negates / ignores --author

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 5:45 PM, Anthony Sottile wrote: > Given the following commits: > ``` > asottile@asottile-VirtualBox:/tmp$ git init test > Initialized empty Git repository in /tmp/test/.git/ > asottile@asottile-VirtualBox:/tmp$ cd test/ >

Re: [PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:31 AM, Brandon Williams wrote: > > Signed-off-by: Brandon Williams > --- > notes-merge.c | 20 ++-- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/notes-merge.c b/notes-merge.c > index

Re: [PATCH 1/2] format-patch: have progress option while generating patches

2017-05-31 Thread Stefan Beller
On Wed, May 31, 2017 at 8:04 AM, Kevin Willford wrote: > When generating patches for the rebase command if the user does > not realize the branch they are rebasing onto is thousands of > commits different there is no progress indication after initial > rewinding message. > >

RE: [PATCH 1/2] format-patch: have progress option while generating patches

2017-05-31 Thread Kevin Willford
> -Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On > Behalf Of Stefan Beller > Sent: Wednesday, May 31, 2017 12:40 PM > To: Kevin Willford > Cc: git@vger.kernel.org; Junio C Hamano ; Kevin > Willford

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 5:46 PM, Johannes Schindelin wrote: > Hi Peff, > > On Wed, 31 May 2017, Jeff King wrote: > >> On Wed, May 31, 2017 at 05:27:21PM +0200, Johannes Schindelin wrote: >> >> > > My intent in putting it into the actual git binary was that it could >>

Re: [PATCH 20/33] combine-diff: convert find_paths_* to struct object_id

2017-05-31 Thread Stefan Beller
On Tue, May 30, 2017 at 10:30 AM, Brandon Williams wrote: > Convert find_paths_generic and find_paths_multitree to use struct > object_id. > > double empty line? Unlike some other prior patches, it is nice to see a commit message here. :) Code of the patches up to here looks

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Mon, May 29, 2017 at 8:23 AM, Junio C Hamano wrote: > * ab/pcre-v2 (2017-05-26) 7 commits > - grep: add support for PCRE v2 > - grep: un-break building with PCRE < 8.20 > - grep: un-break building with PCRE < 8.32 > - grep: add support for the PCRE v1 JIT API > - log:

Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

2017-05-31 Thread Stefan Beller
On Wed, May 31, 2017 at 8:04 AM, Kevin Willford wrote: > This change passes the progress option of format-patch by > default and passes the -q --quiet option through to the > format-patch call so that it is respected as well. This is not conflicting with Johannes rewrite of

Re: Coloring

2017-05-31 Thread Samuel Lijin
On Wed, May 31, 2017 at 2:33 PM, Irving Rabin wrote: > > Folks, I am reporting an issue with coloring of the output of Git > commands, like status, diff, etc. > > Specifically, if the field is supposed to be white, it doesn't mean it > should be literally 0xFF. It should be

[PATCH 0/3] Add regression tests for recent rebase -i fixes

2017-05-31 Thread Phillip Wood
From: Phillip Wood These patches add some tests for the fixes I sent the week before last. The output tests check the messages for stashes that apply and fail for all three variants of rebase. They are quite strict but I couldn't think of a better way to check that

[PATCH 1/3] rebase -i: Add test for reflog message

2017-05-31 Thread Phillip Wood
From: Phillip Wood Check that the reflog message written to the branch reflog when the rebase is completed is correct. This checks for regressions for the fix in commit 4ab867b8fc rebase -i: fix reflog message Signed-off-by: Phillip Wood

[PATCH] [BUG] test_expect_failure mailinfo -b fatals

2017-05-31 Thread Kyle J. McKay
This subject line: > Subject: [other] [PATCH] message does not get along with the git mailinfo "-b" option. In fact, it triggers a fatal bug: > fatal: `pos + len' is too far after the end of the buffer While I did not do any exhaustive checking, I do happen to have a few builds of various

[PATCH 2/3] rebase: Add tests for console output

2017-05-31 Thread Phillip Wood
From: Phillip Wood Check the console output when using --autostash and the stash applies cleanly is what we expect. To avoid this test depending on commit and stash hashes it uses sed to replace them with XXX. The sed script also replaces carriage returns in the

[PATCH 3/3] rebase: Add tests for console output with conflicting stash

2017-05-31 Thread Phillip Wood
From: Phillip Wood Check that the console output is what we expect when restoring autostashed changes fails. Signed-off-by: Phillip Wood --- t/t3420-rebase-autostash.sh | 10 +- t/t3420/expected-fail-am | 8

Re: [PATCH v3 6/6] fsmonitor: add a sample query-fsmonitor hook script for Watchman

2017-05-31 Thread Christian Couder
On Thu, May 25, 2017 at 8:36 PM, Ben Peart wrote: > templates/hooks--query-fsmonitor.sample | 37 > + > 1 file changed, 37 insertions(+) > create mode 100644 templates/hooks--query-fsmonitor.sample Please make this file executable like the

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

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

[PATCH] submodule: mark some file-local symbols as static

2017-05-31 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-blanket-recursive' branch, could you please squash this into the relevant patch (commit 0e5bca302a "Introduce 'submodule.recurse' option for worktree manipulators", 26-05-2017).

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

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 3:37 PM, Ben Peart wrote: > On 5/31/2017 3:59 AM, Christian Couder wrote: >> >> On Thu, May 25, 2017 at 3:55 PM, Ben Peart wrote: >>> >>> >>> On 5/24/2017 6:54 AM, Christian Couder wrote: > > > A new git hook

[PATCH 09/31] setup: add comment indicating a hack

2017-05-31 Thread Brandon Williams
'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should

[PATCH 10/31] config: migrate the_configset to the_repository

2017-05-31 Thread Brandon Williams
Migrate the default config to be stored within 'the_repository'. Signed-off-by: Brandon Williams --- config.c | 185 ++- config.h | 1 + repo.c | 21 repo.h | 11 4 files changed, 146

Re: [PATCH v2] send-email: Net::SMTP::SSL is obsolete, use only when necessary

2017-05-31 Thread Jonathan Nieder
Hi, Dennis Kaarsemaker wrote: > Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine > since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 > isn't that old yet, keep the old code in place and use it when > necessary. This broke git send-email for me. The error

[PATCH 04/31] setup: don't perform lazy initialization of repository state

2017-05-31 Thread Brandon Williams
Under some circumstances (bogus GIT_DIR value or the discovered gitdir is '.git') 'setup_git_directory()' won't initialize key repository state. This leads to inconsistent state after running the setup code. To account for this inconsistent state, lazy initialization is done once a caller asks

[PATCH 23/31] ls-files: convert show_killed_files to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c37e9de11..f9578cf9f 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@

Re: [PATCHv4 2/2] Documentation/clone: document ignored configuration variables

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 10:50 AM, SZEDER Gábor wrote: > On Tue, May 30, 2017 at 11:01 AM, Ævar Arnfjörð Bjarmason > wrote: >> On Tue, May 30, 2017 at 9:12 AM, SZEDER Gábor wrote: > >>> diff --git a/Documentation/git-clone.txt

Re: persistent-https, url insteadof, and `git submodule`

2017-05-31 Thread Ævar Arnfjörð Bjarmason
On Wed, May 31, 2017 at 6:50 AM, Jeff King wrote: > On Fri, May 26, 2017 at 11:22:37AM -0500, Elliott Cable wrote: > >> Hi! Thanks for the responses (I hope reply-all isn't bad mailing-list >> etiquette? Feel free to yell at with a direct reply!). For whatever it's >> worth, as a

Re: persistent-https, url insteadof, and `git submodule`

2017-05-31 Thread Jeff King
On Wed, May 31, 2017 at 04:23:49PM +0200, Ævar Arnfjörð Bjarmason wrote: > > It really is an issue of the user knowing about the problem (and how to > > solve it), and I don't think we can get around that securely. So better > > documentation probably is the right solution. > > > > I'll see if I

[PATCH 16/31] convert: convert crlf_to_git to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- convert.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 574003023..ff3e72657 100644 --- a/convert.c +++ b/convert.c @@ -219,13 +219,13 @@ static void check_safe_crlf(const char

[PATCH 12/31] submodule-config: store the_submodule_cache in the_repository

2017-05-31 Thread Brandon Williams
Refactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- repo.c | 6 + repo.h | 2 ++

[PATCH 08/31] environment: store worktree in the_repository

2017-05-31 Thread Brandon Williams
Migrate 'work_tree' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- environment.c | 9 - repo.c| 7 +++ repo.h| 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index

[PATCH 07/31] environment: place key repository state in the_repository

2017-05-31 Thread Brandon Williams
Migrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- cache.h | 1 - environment.c | 65

[PATCH 13/31] repo: add repo_read_gitmodules

2017-05-31 Thread Brandon Williams
Teach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file. Signed-off-by: Brandon Williams --- repo.c | 14 ++ repo.h | 1 + 2 files changed, 15 insertions(+) diff --git a/repo.c b/repo.c index

[PATCH 03/31] config: don't implicitly use gitdir

2017-05-31 Thread Brandon Williams
Commit 2185fde56 (config: handle conditional include when $GIT_DIR is not set up) added a 'git_dir' field to the config_options struct. Let's use this option field explicitly all the time instead of occasionally falling back to calling 'git_pathdup("config")' to get the path to the local

[PATCH 14/31] submodule: convert is_submodule_initialized to work on a repository

2017-05-31 Thread Brandon Williams
Convert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment. Signed-off-by: Brandon Williams --- builtin/grep.c | 3 ++- builtin/submodule--helper.c

[PATCH 26/31] ls-files: convert ce_excluded to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 2838e2f75..289c6b2a5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -322,10 +322,11 @@

[PATCH 27/31] ls-files: convert prune_cache to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 289c6b2a5..e2d8fb7f6 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -381,30

[PATCH 25/31] ls-files: convert show_ru_info to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index d00ca7810..2838e2f75 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -293,14 +293,14 @@

[PATCH 17/31] convert: convert convert_to_git_filter_fd to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- convert.c | 5 +++-- convert.h | 3 ++- sha1_file.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/convert.c b/convert.c index ff3e72657..824b606fa 100644 --- a/convert.c +++ b/convert.c @@ -1109,7 +1109,8 @@ int

[PATCH 31/31] ls-files: use repository object

2017-05-31 Thread Brandon Williams
Convert ls-files to use a repository struct and recurse submodules inprocess. Signed-off-by: Brandon Williams --- builtin/ls-files.c | 211 ++--- git.c | 2 +- repo.c

[PATCH 20/31] tree: convert read_tree to take an index parameter

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 2 +- tree.c | 28 ++-- tree.h | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index

[PATCH 22/31] ls-files: convert write_eolinfo to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- builtin/ls-files.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a5ceeb052..c37e9de11 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -54,17 +54,16

[PATCH 19/31] convert: convert renormalize_buffer to take an index

2017-05-31 Thread Brandon Williams
Signed-off-by: Brandon Williams --- convert.c | 6 -- convert.h | 3 ++- ll-merge.c| 2 +- merge-recursive.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 5af6fdf3f..7d2a519da 100644 ---

  1   2   >