Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

["Jakub Narębski" <jnareb@gmail.com>]

W dniu 03.08.2016 o 00:24, Junio C Hamano pisze:

> --------------------------------------------------
> [Stalled]
> 
> * jh/clean-smudge-annex (2016-08-01) 9 commits
>  - use smudgeToFile filter in recursive merge
>  - use smudgeToFile filter in git am
>  - better recovery from failure of smudgeToFile filter
>  - warn on unusable smudgeToFile/cleanFromFile config
>  - use smudgeToFile in git checkout etc
>  - use cleanFromFile in git add
>  - add smudgeToFile and cleanFromFile filter configs
>  - clarify %f documentation
>  - Merge branch 'cc/apply-am' into HEAD
>  (this branch uses cc/apply-am.)
> 
>  The interface to "clean/smudge" filters require Git to feed the
>  whole contents via pipe, which is suboptimal for some applications.
>  "cleanFromFile/smudgeToFile" commands are the moral equilvalents
>  for these filters but they interact with the files on the
>  filesystem directly.
> 
>  This is starting to bit-rot, as the topic it is built upon keeps
>  getting rerolled.  I _think_ I rebased it correctly, but I would
>  not be surprised if I made a mistake.
> 
>  Will discard if/when I have to do another rebase, preferring to
>  have a fresh reroll directly from the author.

Could you apply the first part (the first patch) of the series,
namely:

   - clarify %f documentation

> * da/subtree-2.9-regression (2016-07-26) 2 commits
>   (merged to 'next' on 2016-07-26 at 9d71562)
>  + subtree: fix "git subtree split --rejoin"
>  + t7900-subtree.sh: fix quoting and broken && chains
>  (this branch is used by da/subtree-modernize.)
> 
>  "git merge" in Git v2.9 was taught to forbid merging an unrelated
>  lines of history by default, but that is exactly the kind of thing
>  the "--rejoin" mode of "git subtree" (in contrib/) wants to do.
>  "git subtree" has been taught to use the "--allow-unrelated-histories"
>  option to override the default.
> 
>  Will merge to 'master'.

Good. At least one Git user was bitten by this bug, see
<1BED74C8-2E4C-4CA7-B785-F0666B69C1A7@gmail.com>


P.S. I guess that filter.<driver>.process series is considered
     pre-cooking?

-- 
Jakub Narębski