Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Jeff King]

On Mon, May 28, 2018 at 01:20:41PM +0200, Johannes Schindelin wrote:

> On Mon, 28 May 2018, Junio C Hamano wrote:
> 
> > Johannes Schindelin  writes:
> > 
> > > On Thu, 24 May 2018, Junio C Hamano wrote:
> > >
> > >> * js/empty-config-section-fix (2018-05-18) 1 commit
> > >>  - config: a user-provided invalid section is not a BUG
> > >> 
> > >>  Error codepath fix.
> > >> 
> > >>  Will merge to 'next'.
> > >
> > > As a hotfix, maybe we can fast-track it to master?
> > 
> > Hotfix is a proposed fix for an issue that is so important to be a
> > showstopper.  This one must be fixed before the final release, but I
> > do not think it's not that urgent to force us to drop everything
> > else and merge it to master immediately.
> 
> Well, in this case, a user might report a BUG when they simply have an
> invalid config.
> 
> I do not care all that much, but Peff (who reported this) might.

I think it's fine to just fix it before release. Both the likelihood of
it happening and its severity are pretty low.

-Peff

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Johannes Schindelin]

Hi Junio,

On Mon, 28 May 2018, Junio C Hamano wrote:

> Johannes Schindelin  writes:
> 
> > On Thu, 24 May 2018, Junio C Hamano wrote:
> >
> >> * js/empty-config-section-fix (2018-05-18) 1 commit
> >>  - config: a user-provided invalid section is not a BUG
> >> 
> >>  Error codepath fix.
> >> 
> >>  Will merge to 'next'.
> >
> > As a hotfix, maybe we can fast-track it to master?
> 
> Hotfix is a proposed fix for an issue that is so important to be a
> showstopper.  This one must be fixed before the final release, but I
> do not think it's not that urgent to force us to drop everything
> else and merge it to master immediately.

Well, in this case, a user might report a BUG when they simply have an
invalid config.

I do not care all that much, but Peff (who reported this) might.

Ciao,
Dscho

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Junio C Hamano]

Johannes Schindelin  writes:

> Hi Junio,
>
> On Thu, 24 May 2018, Junio C Hamano wrote:
>
>> * js/empty-config-section-fix (2018-05-18) 1 commit
>>  - config: a user-provided invalid section is not a BUG
>> 
>>  Error codepath fix.
>> 
>>  Will merge to 'next'.
>
> As a hotfix, maybe we can fast-track it to master?

Hotfix is a proposed fix for an issue that is so important to be a
showstopper.  This one must be fixed before the final release, but I
do not think it's not that urgent to force us to drop everything
else and merge it to master immediately.

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Junio C Hamano]

Elijah Newren  writes:

> On Wed, May 23, 2018 at 5:02 PM, Junio C Hamano  wrote:
>> Here are the topics that have been cooking.  Commits prefixed with
>> '-' are only in 'pu' (proposed updates) while commits prefixed with
>> '+' are in 'next'.  The ones marked with '.' do not appear in any of
>> the integration branches, but I am still holding onto them.
>
> I don't see the series posted at
> https://public-inbox.org/git/20180522004327.13085-1-new...@gmail.com/
> (various merge-recursive code cleanups) -- or its predecessor --
> showing up anywhere.  Did it slip through the cracks, by chance?

It does not require any chance for various serieses, especially
their earlier iterations, do not get enough time slots to be
processed soon after they are posted, as there are too many topics,
both patches and discussions, active on the list.

Especially the ones that are designed not to apply to the current
'master', which would give me a strong incentive to ignore them
until the prerequisite topics in flight hits 'master' ;-)

js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Johannes Schindelin]

Hi Junio,

On Thu, 24 May 2018, Junio C Hamano wrote:

> * js/empty-config-section-fix (2018-05-18) 1 commit
>  - config: a user-provided invalid section is not a BUG
> 
>  Error codepath fix.
> 
>  Will merge to 'next'.

As a hotfix, maybe we can fast-track it to master?

Thanks,
Dscho

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Luke Diamand]

On 24 May 2018 at 01:02, Junio C Hamano  wrote:
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> You can find the changes described here in the integration branches
> of the repositories listed at
>
> http://git-blame.blogspot.com/p/git-public-repositories.html
>




>
>
> * ld/p4-unshelve (2018-05-23) 3 commits
>  - git-p4: unshelve: use action==add instead of rev==none
>  - SQUASH???
>  - git-p4: add unshelve command
>
>  "git p4" learned to "unshelve" shelved commit from P4.
>
>  Expecting a reroll.
>  cf. 

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Ævar Arnfjörð Bjarmason]

On Thu, May 24 2018, Junio C Hamano wrote:

> * ab/fetch-tags-noclobber (2018-05-16) 9 commits
>  - fixup! push tests: assert re-pushing annotated tags
>  - fetch: stop clobbering existing tags without --force
>  - fetch tests: add a test clobbering tag behavior
>  - fetch tests: correct a comment "remove it" -> "remove them"
>  - push doc: correct lies about how push refspecs work
>  - push tests: assert re-pushing annotated tags
>  - push tests: add more testing for forced tag pushing
>  - push tests: fix logic error in "push" test assertion
>  - push tests: remove redundant 'git push' invocation
>
>  Expecting a reboot of the discussion to take it to some conclusion
>  and then a reroll.
>  cf. 
>  cf. 
>  cf. 
>  cf. 

I hope to follow-up with this soon. Sorry for the delay.

> * ab/get-short-oid (2018-05-11) 5 commits
>   (merged to 'next' on 2018-05-23 at 07e1908439)
>  + get_short_oid: sort ambiguous objects by type, then SHA-1
>  + sha1-name.c: move around the collect_ambiguous() function
>  + git-p4: change "commitish" typo to "committish"
>  + sha1-array.h: align function arguments
>  + sha1-name.c: remove stray newline

Sweet. I'll follow-up with the rest of the patches revised once that
lands now that I'm fairly sure what you and Jeff mean by $sha1^{}
:)

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Stefan Beller]

> * sb/diff-color-move-more (2018-05-21) 8 commits
>  - diff: color-moved white space handling options imply color-moved
>  - diff.c: add --color-moved-ignore-space-delta option
>  - diff.c: decouple white space treatment from move detection algorithm
>  - diff.c: add a blocks mode for moved code detection
>  - diff.c: adjust hash function signature to match hashmap expectation
>  - diff.c: do not pass diff options as keydata to hashmap
>  - xdiff/xdiffi.c: remove unneeded function declarations
>  - xdiff/xdiff.h: remove unused flags
>
>  "git diff --color-moved" feature has further been tweaked.
>
>  Will merge to 'next'.

This is nowhere near done after reading the feedback from
Jonathan Tan; I am considering redoing it completely differently.

Please eject from next. (at least the last 3 patches, the patches
up to "add blocks mode" are reasonable.)

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

[Elijah Newren]

Hi Junio,

On Wed, May 23, 2018 at 5:02 PM, Junio C Hamano  wrote:
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.

I don't see the series posted at
https://public-inbox.org/git/20180522004327.13085-1-new...@gmail.com/
(various merge-recursive code cleanups) -- or its predecessor --
showing up anywhere.  Did it slip through the cracks, by chance?

What's cooking in git.git (May 2018, #03; Wed, 23)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.  The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.

You can find the changes described here in the integration branches
of the repositories listed at

http://git-blame.blogspot.com/p/git-public-repositories.html

--
[Graduated to "master"]

* ab/perl-python-attrs (2018-04-27) 3 commits
  (merged to 'next' on 2018-05-08 at b440e9bbb9)
 + .gitattributes: add a diff driver for Python
 + .gitattributes: use the "perl" differ for Perl
 + .gitattributes: add *.pl extension for Perl

 We learned that our source files with ".pl" and ".py" extensions
 are Perl and Python files respectively and changes to them are
 better viewed as such with appropriate diff drivers.


* ah/misc-doc-updates (2018-05-06) 7 commits
  (merged to 'next' on 2018-05-16 at e2e3b68a66)
 + doc: normalize [--options] to [options] in git-diff
 + doc: add note about shell quoting to revision.txt
 + git-svn: remove ''--add-author-from' for 'commit-diff'
 + doc: add '-d' and '-o' for 'git push'
 + doc: clarify ignore rules for git ls-files
 + doc: align 'diff --no-index' in text and synopsis
 + doc: improve formatting in githooks.txt

 Misc doc fixes.


* ao/config-api-doc (2018-05-11) 1 commit
  (merged to 'next' on 2018-05-22 at a17d6dda92)
 + doc: fix config API documentation about config_with_options

 Doc update.


* bc/asciidoctor-tab-width (2018-05-07) 2 commits
  (merged to 'next' on 2018-05-16 at be2a42c473)
 + Documentation: render revisions correctly under Asciidoctor
 + Documentation: use 8-space tabs with Asciidoctor

 Asciidoctor gives a reasonable imitation for AsciiDoc, but does not
 render illustration in a literal block correctly when indented with
 HT by default. The problem is fixed by forcing 8-space tabs.


* bc/format-patch-cover-no-attach (2018-05-02) 1 commit
  (merged to 'next' on 2018-05-16 at fa1ffeb3fe)
 + format-patch: make cover letters always text/plain

 "git format-patch --cover --attach" created a broken MIME multipart
 message for the cover letter, which has been fixed by keeping the
 cover letter as plain text file.


* bc/mailmap-self (2018-05-08) 1 commit
  (merged to 'next' on 2018-05-16 at a009c64bd2)
 + mailmap: update brian m. carlson's email address


* bp/test-drop-caches (2018-05-04) 1 commit
  (merged to 'next' on 2018-05-16 at 0e40ab2408)
 + test-drop-caches: simplify delay loading of NtSetSystemInformation

 Code simplification.


* bw/server-options (2018-04-24) 4 commits
  (merged to 'next' on 2018-05-08 at a18ce56f3c)
 + fetch: send server options when using protocol v2
 + ls-remote: send server options when using protocol v2
 + serve: introduce the server-option capability
 + Merge branch 'bw/protocol-v2' into HEAD

 The transport protocol v2 is getting updated further.


* cc/perf-aggregate-unknown-option (2018-04-26) 1 commit
  (merged to 'next' on 2018-05-08 at db7d2870f8)
 + perf/aggregate: use Getopt::Long for option parsing

 Perf-test helper updates.


* cc/perf-bisect (2018-05-06) 1 commit
  (merged to 'next' on 2018-05-16 at 5a078a2fdf)
 + perf/bisect_run_script: disable codespeed

 Performance test updates.


* ds/lazy-load-trees (2018-05-02) 6 commits
  (merged to 'next' on 2018-05-02 at d54016d9e3)
 + coccinelle: avoid wrong transformation suggestions from commit.cocci
  (merged to 'next' on 2018-04-25 at b90813f421)
 + commit-graph: lazy-load trees for commits
 + treewide: replace maybe_tree with accessor methods
 + commit: create get_commit_tree() method
 + treewide: rename tree to maybe_tree
 + Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
 (this branch is used by ds/commit-graph-lockfile-fix and 
ds/generation-numbers.)

 The code has been taught to use the duplicated information stored
 in the commit-graph file to learn the tree object name for a commit
 to avoid opening and parsing the commit object when it makes sense
 to do so.


* em/status-rename-config (2018-05-06) 1 commit
  (merged to 'next' on 2018-05-16 at 33c1cc093c)
 + wt-status: use settings from git_diff_ui_config
 (this branch is used by bp/status-rename-config.)

 "git status" learned to pay attention to UI related diff
 configuration variables such as diff.renames.


* en/git-debugger (2018-04-25) 1 commit
  (merged to 'next' on 2018-05-08 at 73369cd1e5)
 + Make running git under other debugger-like programs easy

 Dev support.


* en/rename-directory-detection-reboot (2018-05-08) 36 commits
  (merged to 'next' on 2018-05-08 at be350ebc17)
 + merge-recursive: fix check for skipability of working tree updates
 + merge-recursive: make "Auto-merging" comment show for other merges
 + merge-recursive: fix remainder of was_dirty() to use original index
 + merge-recursive: fix was_tracked() to quit lying with some renamed paths
 + t6046: testcases