Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Junio C Hamano]

Martin Ågren  writes:

> On 29 September 2017 at 06:34, Junio C Hamano  wrote:
>>
>> * sd/branch-copy (2017-09-24) 4 commits
>>   (merged to 'next' on 2017-09-28 at a6eceefa02)
>>  + branch: fix "copy" to never touch HEAD
>>  + branch: add a --copy (-c) option to go with --move (-m)
>>  + branch: add test for -m renaming multiple config sections
>>  + config: create a function to format section headers
>>
>>  "git branch" learned "-c/-C" to create and switch to a new branch
>>  by copying an existing one.
>
> s/and switch to //, I believe, after your finishing patch.

Thanks for careful reading.

Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Martin Ågren]

On 29 September 2017 at 06:34, Junio C Hamano  wrote:
>
> * sd/branch-copy (2017-09-24) 4 commits
>   (merged to 'next' on 2017-09-28 at a6eceefa02)
>  + branch: fix "copy" to never touch HEAD
>  + branch: add a --copy (-c) option to go with --move (-m)
>  + branch: add test for -m renaming multiple config sections
>  + config: create a function to format section headers
>
>  "git branch" learned "-c/-C" to create and switch to a new branch
>  by copying an existing one.

s/and switch to //, I believe, after your finishing patch.

Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Junio C Hamano]

Derrick Stolee  writes:

> On 9/29/2017 12:34 AM, Junio C Hamano wrote:
>> * ds/find-unique-abbrev-optim (2017-09-19) 4 commits
>>   - SQUASH???
>>   - sha1_name: parse less while finding common prefix
>>   - sha1_name: unroll len loop in find_unique_abbrev_r()
>>   - sha1_name: create perf test for find_unique_abbrev()
>
> I'll re-roll my patch on Monday if reviews have stabilized. I think I
> understand your comments this time (especially around 32-bit ints).

Will look forward to seeing them.

> What does "SQUASH???" mean? Is that why there are three meaningful
> commits in this note, despite my five-commit patch? Would you like me
> to squash the commits in v3?

These are found on 'pu' branch; you can check output from

git log --oneline --first-parent origin/master..origin/pu

to see where ds/find-unique-abbrev-optim topic was merged, e.g.

$ git log --oneline --first-parent origin/master..origin/pu | grep ds/fi
d8c0323166 Merge branch 'ds/find-unique-abbrev-optim' into jch

and you'll find these four commits with:

$ git log -p origin/master..d8c0323166^2

I knew you had more patches, but I looked at the first three, found
a few glitches that I knew will have to be rerolled, and stopped
looking at the remainder of the series at that point (not because I
felt the topic was helpless, but because I needed to switch my
attention to other topics), so that is why the only three from the
beginning is queued there.  Then I found that with these three, the
tree does not even compile, but I wanted to make sure that 'pu' at
least builds before I push it out, so I created another commit on
top of these three patches as a fix-up to make it compile, so that I
can merge the topic to 'pu'.  This is done in the hope that it would
help contributors more (by showing a small fix that needs to be
squashed into relevant patches when the topic is updated and
re-sent) than plain dropping a topic that does not compile or pass
test on the floor.

So that is what a SQUASH??? commit at the tip of some topics mean.

Thanks.

Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Stefan Beller]

On Fri, Sep 29, 2017 at 6:08 AM, Derrick Stolee  wrote:
> Hi Junio,
>
> On 9/29/2017 12:34 AM, Junio C Hamano wrote:
>>
>> * ds/find-unique-abbrev-optim (2017-09-19) 4 commits
>>   - SQUASH???
>>   - sha1_name: parse less while finding common prefix
>>   - sha1_name: unroll len loop in find_unique_abbrev_r()
>>   - sha1_name: create perf test for find_unique_abbrev()
>
>
> I'll re-roll my patch on Monday if reviews have stabilized. I think I
> understand your comments this time (especially around 32-bit ints).
> Since I'm new to the list, I'm not sure what the change in messages
> means here.
>
> What does "SQUASH???" mean? Is that why there are three meaningful commits
> in this note, despite my five-commit patch? Would you like me to squash the
> commits in v3?

If you fetch from github/gitster/git, there is a branch
'ds/find-unique-abbrev-optim'
containing four commits; three by you, one by Junio. This one commit
is titled 'SQUASH???' as Junio did not want to write out what the
commit is doing
(e.g. fixing a typo, a memleak, or indentation or other small detail
that he observed)

You want to take the content of the commit and add it to one of yours,
where appropriate.

>
> Thanks,
> -Stolee

Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Derrick Stolee]

Hi Junio,

On 9/29/2017 12:34 AM, Junio C Hamano wrote:

* ds/find-unique-abbrev-optim (2017-09-19) 4 commits
  - SQUASH???
  - sha1_name: parse less while finding common prefix
  - sha1_name: unroll len loop in find_unique_abbrev_r()
  - sha1_name: create perf test for find_unique_abbrev()


I'll re-roll my patch on Monday if reviews have stabilized. I think I 
understand your comments this time (especially around 32-bit ints).

Since I'm new to the list, I'm not sure what the change in messages
means here.

What does "SQUASH???" mean? Is that why there are three meaningful 
commits in this note, despite my five-commit patch? Would you like me to 
squash the commits in v3?


Thanks,
-Stolee

Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

[Ian Campbell]

On Fri, 2017-09-29 at 13:34 +0900, Junio C Hamano wrote:
> 
> * ic/fix-filter-branch-to-handle-tag-without-tagger (2017-09-22) 4
> commits
>   (merged to 'next' on 2017-09-25 at c7550033df)
>  + filter-branch: use hash-object instead of mktag
>  + filter-branch: stash away ref map in a branch
>  + filter-branch: preserve and restore $GIT_AUTHOR_* and
> $GIT_COMMITTER_*
>  + filter-branch: reset $GIT_* before cleaning up
> 
>  "git filter-branch" cannot reproduce a history with a tag without
>  the tagger field, which only ancient versions of Git allowed to be
>  created.  This has been corrected.

This set of patches also includes the new --state-branch option to
allow you to do incremental conversions.

Ian.

What's cooking in git.git (Sep 2017, #06; Fri, 29)

[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"]

* hn/typofix (2017-09-22) 1 commit
  (merged to 'next' on 2017-09-25 at 489ad60f5b)
 + submodule.h: typofix


* ic/fix-filter-branch-to-handle-tag-without-tagger (2017-09-22) 4 commits
  (merged to 'next' on 2017-09-25 at c7550033df)
 + filter-branch: use hash-object instead of mktag
 + filter-branch: stash away ref map in a branch
 + filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*
 + filter-branch: reset $GIT_* before cleaning up

 "git filter-branch" cannot reproduce a history with a tag without
 the tagger field, which only ancient versions of Git allowed to be
 created.  This has been corrected.


* ik/userdiff-html-h-element-fix (2017-09-24) 1 commit
  (merged to 'next' on 2017-09-25 at e3cbe89672)
 + userdiff: fix HTML hunk header regexp

 The built-in pattern to detect the "function header" for HTML did
 not match .. elements without any attributes, which has
 been fixed.


* jc/merge-x-theirs-docfix (2017-09-25) 1 commit
  (merged to 'next' on 2017-09-26 at 5a7d954982)
 + merge-strategies: avoid implying that "-s theirs" exists

 The documentation for '-X' for merges was misleadingly
 written to suggest that "-s theirs" exists, which is not the case.


* jk/describe-omit-some-refs (2017-09-17) 1 commit
  (merged to 'next' on 2017-09-24 at c373c71279)
 + describe: fix matching to actually match all patterns
 (this branch is used by mk/describe-match-with-all.)

 "git describe --match" learned to take multiple patterns in v2.13
 series, but the feature ignored the patterns after the first one
 and did not work at all.  This has been fixed.


* jk/diff-blob (2017-09-22) 1 commit
  (merged to 'next' on 2017-09-25 at 38286c8ff5)
 + cat-file: handle NULL object_context.path

 "git cat-file --textconv" started segfaulting recently, which
 has been corrected.


* jk/doc-read-tree-table-asciidoctor-fix (2017-09-24) 1 commit
  (merged to 'next' on 2017-09-25 at 070163b964)
 + doc: put literal block delimiter around table

 A docfix.


* jk/fallthrough (2017-09-22) 3 commits
  (merged to 'next' on 2017-09-25 at ad96c37620)
 + consistently use "fallthrough" comments in switches
 + curl_trace(): eliminate switch fallthrough
 + test-line-buffer: simplify command parsing

 Many codepaths have been updated to squelch -Wimplicit-fallthrough
 warnings from Gcc 7 (which is a good code hygiene).


* jm/status-ignored-directory-optim (2017-09-19) 1 commit
  (merged to 'next' on 2017-09-24 at ca50f5ed41)
 + Improve performance of git status --ignored

 "git status --ignored", when noticing that a directory without any
 tracked path is ignored, still enumerated all the ignored paths in
 the directory, which is unnecessary.  The codepath has been
 optimized to avoid this overhead.


* js/win32-lazyload-dll (2017-09-26) 1 commit
  (merged to 'next' on 2017-09-26 at 04577bf1c5)
 + Win32: simplify loading of DLL functions

 Add a helper in anticipation for its need in a future topic RSN.


* jt/fast-export-copy-modify-fix (2017-09-21) 1 commit
  (merged to 'next' on 2017-09-24 at c02bfe1902)
 + fast-export: do not copy from modified file

 "git fast-export" with -M/-C option issued "copy" instruction on a
 path that is simultaneously modified, which was incorrect.


* ks/doc-use-camelcase-for-config-name (2017-09-25) 1 commit
  (merged to 'next' on 2017-09-26 at 7b4d2115af)
 + doc: camelCase the config variables to improve readability

 Doc update.


* ma/leakplugs (2017-09-24) 6 commits
  (merged to 'next' on 2017-09-25 at 69d381a96a)
 + pack-bitmap[-write]: use `object_array_clear()`, don't leak
 + object_array: add and use `object_array_pop()`
 + object_array: use `object_array_clear()`, not `free()`
 + leak_pending: use `object_array_clear()`, not `free()`
 + commit: fix memory leak in `reduce_heads()`
 + builtin/commit: fix memory leak in `prepare_index()`

 Memory leaks in various codepaths have been plugged.


* mk/describe-match-with-all (2017-09-20) 2 commits
  (merged to 'next' on 2017-09-24 at f96d58dd83)
 + describe: teach --match to handle branches and remotes
 + Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all

 "git describe --match " has been taught to play well with
 the "--all" option.


* mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
  (merged to 'next' on 2017-09-26 at b4983ac027)
 + diff-delta: do not allow delta offset truncation

 The delta format used in the packfile cannot reference data at
 offset larger than what can be expressed in 4-byte, but