Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

On Wed, Nov 25, 2015 at 12:04:10AM +0200, Max Kirillov wrote:

> On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote:
> > * mk/blame-first-parent (2015-11-20) 1 commit
> >  - blame: fix object casting regression
> > 
> >  Regression fix for a topic already in master.
> > 
> >  Will merge to 'next'.
> 
> You mistyped my name in the commit message of 044e0ad679 :)

Argh, sorry about that. I even remember checking it because I wanted to
make sure I got the correct number of l's. But vowels, eh, it's fine. :)

Will fix. Thanks for catching it.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

On Tue, Nov 24, 2015 at 10:53:45AM +0100, Michael J Gruber wrote:

> > and all topic branches at:
> > 
> > https://github.com/peff/git/
> > 
> > But note that I will _not_ be pushing to kernel.org.
> 
> Does peff/git include the integration branches, too?

Yes, it does.

> Also, that one should be uncontroversial (f[l]amous last words):
> 
> From: Michael J Gruber 
> Subject: [PATCH] Documentation/diff: give --word-diff-regex=. example
> Date: Fri, 20 Nov 2015 14:36:14 +0100
> 
> Message-ID:
> <6697f80b679b2bc910aa02a0fc945453be38c532.1448026505.git@drmicha.warpmail.net>

Thanks. It came while I was doing the cycle. I'll include it in the
current one.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Max Kirillov]

On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote:
> * mk/blame-first-parent (2015-11-20) 1 commit
>  - blame: fix object casting regression
> 
>  Regression fix for a topic already in master.
> 
>  Will merge to 'next'.

You mistyped my name in the commit message of 044e0ad679 :)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Michael J Gruber]

Jeff King venit, vidit, dixit 20.11.2015 15:09:
> What's cooking in git.git (Nov 2015, #03; Fri, 20)
> --
> 
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
> 
> Sorry for the extreme delay in pushing out my tree. I ended up busier
> than I expected during the first week of Junio's absence, and then it
> took me a while to dig myself out of the ever-filling hole of incoming
> topics. :)
> 
> Expect quite a few new topics in this edition.  A number of them have
> seen review already, and I'm planning to merge them to "next" fairly
> quickly (I may do another integration cycle late tonight or tomorrow
> with those changes).
> 
> I still have a few threads to comb through on the list. If you don't see
> the latest version of your topic here, please feel free to ping me, or
> to repost.
> 
> You can find the normal integration branches at:
> 
> https://github.com/git/git/
> 
> and all topic branches at:
> 
> https://github.com/peff/git/
> 
> But note that I will _not_ be pushing to kernel.org.

Does peff/git include the integration branches, too?

Also, that one should be uncontroversial (f[l]amous last words):

From: Michael J Gruber <g...@drmicha.warpmail.net>
Subject: [PATCH] Documentation/diff: give --word-diff-regex=. example
Date: Fri, 20 Nov 2015 14:36:14 +0100

Message-ID:
<6697f80b679b2bc910aa02a0fc945453be38c532.1448026505.git@drmicha.warpmail.net>

http://permalink.gmane.org/gmane.comp.version-control.git/281520>

Thanks for your work!

Michael
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Luke Diamand]

On 20/11/15 14:09, Jeff King wrote:

What's cooking in git.git (Nov 2015, #03; Fri, 20)
--

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.







  Some commits need better explanation.

  Waiting for a reroll.


* ld/p4-detached-head (2015-09-09) 2 commits
  - git-p4: work with a detached head
  - git-p4: add failing test for submit from detached head


Rerolled on the 21st.

Thanks
Luke

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Johannes Schindelin]

Hi Peff,

On Fri, 20 Nov 2015, Jeff King wrote:

> * pt/http-socks-proxy (2015-11-20) 1 commit
>   (merged to 'next' on 2015-11-20 at dc6ae48)
>  + remote-http(s): support SOCKS proxies
> 
>  Add support for talking http/https over socks proxy.
> 
>  Will cook in 'next'.

With all due respect, I do not thing this needs more cooking, as it

1. was tested extensively by yours truly in the Git for Windows context,
   and it

2. cannot possibly break anything because it tests specifically for the
   "socks:" prefix. It is a pure new feature.

Ciao,
Johannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Victor Leschuk]

On 11/20/2015 05:09 PM, Jeff King wrote:

* vl/grep-configurable-threads (2015-11-01) 1 commit
  - grep: add --threads= option and grep.threads configuration

  "git grep" can now be configured (or told from the command line)
  how many threads to use when searching in the working tree files.

  I haven't reviewed v6 yet. More eyes are welcome.
Actually v6 includes only changes to special meaning of "0" (0 is now 
default behavior - 8 threads), little corrections to documentation and 
getting rid of online_cpus() in decision-tree. All as discussed in 
comments for v4/5.


--
Victor
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

On Mon, Nov 23, 2015 at 02:09:42PM +0100, Johannes Schindelin wrote:

> On Fri, 20 Nov 2015, Jeff King wrote:
> 
> > * pt/http-socks-proxy (2015-11-20) 1 commit
> >   (merged to 'next' on 2015-11-20 at dc6ae48)
> >  + remote-http(s): support SOCKS proxies
> > 
> >  Add support for talking http/https over socks proxy.
> > 
> >  Will cook in 'next'.
> 
> With all due respect, I do not thing this needs more cooking, as it
> 
> 1. was tested extensively by yours truly in the Git for Windows context,
>and it
> 
> 2. cannot possibly break anything because it tests specifically for the
>"socks:" prefix. It is a pure new feature.

Any time I want to say "cannot possibly" I start to get very worried
that I have missed something. :)

I do think this topic looks OK, but it just made it into next during the
last integration cycle (it was waiting on Pat's signoff, which I
amended). I think it should be OK to cook in next for a few days and
then merge to master (i.e., plenty of time for v2.7).

Thanks (and thank you for extra feedback; especially because of the
maintainer switch I do not have full context on all of the topics).

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

On Mon, Nov 23, 2015 at 12:02:35AM +0530, Karthik Nayak wrote:

> > * kn/for-each-branch-remainder (2015-10-02) 9 commits
> >  - branch: implement '--format' option
> >  - branch: use ref-filter printing APIs
> >  - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
> >  - ref-filter: introduce format_ref_array_item()
> >  - ref-filter: adopt get_head_description() from branch.c
> >  - ref-filter: modify "%(objectname:short)" to take length
> >  - ref-filter: add support for %(path) atom
> >  - ref-filter: implement %(if:equals=) and %(if:notequals=)
> >  - ref-filter: implement %(if), %(then), and %(else) atoms
> >
> >  More unification among "branch -l", "tag -l" and "for-each-ref --format".
> >
> >  Expecting a reroll.
> >  ($gmane/278926)
> >
> 
> This series is supposed to follow this:
> http://thread.gmane.org/gmane.comp.version-control.git/281180 which I
> recently sent.
> So replace "for-each-branch-remainder" with this in "Whats cooking"?

Thanks, it was on my "leftover topics to pick up" list. I'll make sure
it gets updated in the next cycle.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

On Mon, Nov 23, 2015 at 09:06:32AM +, Luke Diamand wrote:

> >  Some commits need better explanation.
> >
> >  Waiting for a reroll.
> >
> >
> >* ld/p4-detached-head (2015-09-09) 2 commits
> >  - git-p4: work with a detached head
> >  - git-p4: add failing test for submit from detached head
> 
> Rerolled on the 21st.

Thanks, I"ll pick that up in the next cycle.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Karthik Nayak]

>
> * kn/for-each-branch-remainder (2015-10-02) 9 commits
>  - branch: implement '--format' option
>  - branch: use ref-filter printing APIs
>  - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
>  - ref-filter: introduce format_ref_array_item()
>  - ref-filter: adopt get_head_description() from branch.c
>  - ref-filter: modify "%(objectname:short)" to take length
>  - ref-filter: add support for %(path) atom
>  - ref-filter: implement %(if:equals=) and %(if:notequals=)
>  - ref-filter: implement %(if), %(then), and %(else) atoms
>
>  More unification among "branch -l", "tag -l" and "for-each-ref --format".
>
>  Expecting a reroll.
>  ($gmane/278926)
>

This series is supposed to follow this:
http://thread.gmane.org/gmane.comp.version-control.git/281180 which I
recently sent.
So replace "for-each-branch-remainder" with this in "Whats cooking"?

-- 
Regards,
Karthik Nayak
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

What's cooking in git.git (Nov 2015, #03; Fri, 20)

[Jeff King]

What's cooking in git.git (Nov 2015, #03; Fri, 20)
--

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

Sorry for the extreme delay in pushing out my tree. I ended up busier
than I expected during the first week of Junio's absence, and then it
took me a while to dig myself out of the ever-filling hole of incoming
topics. :)

Expect quite a few new topics in this edition.  A number of them have
seen review already, and I'm planning to merge them to "next" fairly
quickly (I may do another integration cycle late tonight or tomorrow
with those changes).

I still have a few threads to comb through on the list. If you don't see
the latest version of your topic here, please feel free to ping me, or
to repost.

You can find the normal integration branches at:

https://github.com/git/git/

and all topic branches at:

https://github.com/peff/git/

But note that I will _not_ be pushing to kernel.org.


--
[New Topics]

* ap/doc-env-variable-format (2015-11-11) 1 commit
 - Documentation: make environment variable formatting more consistent

 Minor documentation fixup.

 Will merge to 'next'.


* cb/hook-sigpipe (2015-11-16) 1 commit
 - allow hooks to ignore their standard input stream

 We now consistently allow all hooks to ignore their standard input,
 rather than having git complain of SIGPIPE.

 Will merge to 'next'.


* dg/subtree-test-cleanup (2015-11-13) 7 commits
 - contrib/subtree: Handle '--prefix' argument with a slash appended
 - contrib/subtree: Make each test self-contained
 - contrib/subtree: Add split tests
 - contrib/subtree: Add merge tests
 - contrib/subtree: Add tests for subtree add
 - contrib/subtree: Add test for missing subtree
 - contrib/subtree: Clean and refactor test code

 Test cleanups for the subtree project.

 Will merge to 'next'.


* dk/check-ignore-docs (2015-11-20) 1 commit
 - check-ignore: correct documentation about output

 Documentation clarification for "check-ignore" without "--verbose".

 This may be losing information, and we would want to enhance the
 "--verbose" documentation.

 Will hold for comments.


* dk/rerere-train-quoting (2015-11-20) 1 commit
 - Escape Git's exec path in contrib/rerere-train.sh script

 Fix shell quoting in contrib script.

 Will merge to 'next'.


* dk/t5813-unc-paths (2015-11-20) 1 commit
 - t5813: avoid creating urls that break on cygwin

 Test portability fix for a topic in v2.6.1.

 Will merge to 'next'.


* ec/annotate-deleted (2015-11-20) 1 commit
 - annotate: skip checking working tree if a revision is provided

 Usability fix for annotate-specific " " syntax with deleted
 files.

 Needs review.


* fm/shell-path-whitespace (2015-11-13) 1 commit
 - rebase-i-exec: Allow space in SHELL_PATH

 Portability fix for Windows, which may rewrite $SHELL variable using
 non-POSIX paths.

 Will merge to 'next'.


* jk/filter-branch-no-index (2015-11-06) 1 commit
 - filter-branch: skip index read/write when possible

 Speed up filter-branch for cases where we only care about rewriting
 commits, not tree data.

 Needs review.


* jk/send-email-ca-path (2015-11-20) 1 commit
 - send-email: die if CA path doesn't exist

 Use a safer behavior when we hit errors verifying remote certificates.

 We may want to update this to guide users toward workarounds.


* jk/send-email-complete-aliases (2015-11-20) 2 commits
 - completion: add support for completing email aliases
 - sendemail: teach git-send-email to dump alias names

 Teach send-email to dump mail aliases, so that we can do tab completion
 on the command line.

 This is v4. Is everybody happy with this one?


* jk/send-email-expand-paths (2015-11-20) 2 commits
 - send-email: expand paths in sendemail.{to,cc}cmd config
 - send-email: expand path in sendemail.smtpsslcertpath config

 Expand paths in some send-email config variables.

 Needs review.


* js/test-modernize-t9300 (2015-11-20) 7 commits
 - modernize t9300: move test preparations into test_expect_success
 - modernize t9300: mark here-doc words to ignore tab indentation
 - modernize t9300: use test_when_finished for clean-up
 - modernize t9300: wrap lines after &&
 - modernize t9300: use test_must_be_empty
 - modernize t9300: use test_must_fail
 - modernize t9300: single-quote placement and indentation

 Clean up style in an ancient test.

 Will merge to 'next'.


* ls/p4-test-timeouts (2015-11-20) 3 commits
 - git-p4: add trap to kill p4d on test exit
 - git-p4: add p4d timeout in tests
 - git-p4: retry kill/cleanup operations in tests with timeout

 Work around some test flakiness with p4d.

 Will merge to 'next'.


* ls/test-must-fail-sigpipe (2015-11-20) 2 commits
 - add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
 - implement test_might_fail u