Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-24 Thread Jeff King
On Thu, May 24, 2018 at 08:40:18PM +0530, Kaartic Sivaraam wrote: > > On the other hand, I'm not sure this is that big a deal. The point of > > the deprecation warning is to catch people who are actually trying to > > use "-l" as "--create-reflog", and that case does not page. The people > >

jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-24 Thread Kaartic Sivaraam
On Thursday 17 May 2018 07:06 PM, Jeff King wrote: > But because git-branch does not kick in the pager until later > (because it only wants to do it for list-mode), that happens _after_ > we've emitted the message. > I observe exactly the consequence of this behaviour. First, the error is

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-21 Thread Stefan Beller
>> Many tests hardcode the raw object names, which would change once >> we migrate away from SHA-1. While some of them must test against >> exact object names, most of them do not have to use hardcoded >> constants in the test. The latter kind of tests have been updated >> to test the moral

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-20 Thread brian m. carlson
On Thu, May 17, 2018 at 03:01:40PM +0900, Junio C Hamano wrote: > * bc/hash-independent-tests (2018-05-16) 28 commits > - t5300: abstract away SHA-1-specific constants > - t4208: abstract away SHA-1-specific constants > - t4045: abstract away SHA-1-specific constants > - t4042: abstract away

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Stefan Beller
>> Please do not replace what already hit 'next'. > > Here is what I made these two into a relative fix on top. Thanks, I was about to prepare the same.

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >>> * sb/object-store-replace (2018-05-10) 2 commits >>> (merged to 'next' on 2018-05-16 at 41bbedcc81) >>> + replace-object.c: remove the_repository from prepare_replace_object >>> + object.c: free

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Stefan Beller
On Thu, May 17, 2018 at 3:36 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> * sb/object-store-replace (2018-05-10) 2 commits >>> (merged to 'next' on 2018-05-16 at 41bbedcc81) >>> + replace-object.c: remove the_repository from

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Junio C Hamano
Stefan Beller writes: >> * sb/object-store-replace (2018-05-10) 2 commits >> (merged to 'next' on 2018-05-16 at 41bbedcc81) >> + replace-object.c: remove the_repository from prepare_replace_object >> + object.c: free replace map in raw_object_store_clear >> >> Hotfix. >>

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Stefan Beller
> * sb/object-store-replace (2018-05-10) 2 commits > (merged to 'next' on 2018-05-16 at 41bbedcc81) > + replace-object.c: remove the_repository from prepare_replace_object > + object.c: free replace map in raw_object_store_clear > > Hotfix. > > Will merge to 'master'. Please do not. (Or do,

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-17 Thread Jeff King
On Thu, May 17, 2018 at 11:48:33AM +0200, Ævar Arnfjörð Bjarmason wrote: > > If there are ample branches, the warning message might be > > hidden out of screen but we shouldn't rely on that, I > > suppose. > > Also if we have lots of branches, depending on your pager

Re: What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread Derrick Stolee
On 5/17/2018 2:01 AM, Junio C Hamano wrote: * ds/generation-numbers (2018-05-02) 11 commits - commit-graph.txt: update design document - merge: check config before loading commits - commit: use generation number in remove_redundant() - commit: add short-circuit to paint_down_to_common()

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-17 Thread Ævar Arnfjörð Bjarmason
On Thu, May 17 2018, Kaartic Sivaraam wrote: > Hi Ævar, > > On Thursday 17 May 2018 03:18 PM, Ævar Arnfjörð Bjarmason wrote: >> I've ended up with that $LESS setting via hackery over the years, so >> maybe I'm doing something retarded, minimal test case: >> >> PAGER=less LESS="--no-init

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-17 Thread Kaartic Sivaraam
Hi Ævar, On Thursday 17 May 2018 03:18 PM, Ævar Arnfjörð Bjarmason wrote: > I've ended up with that $LESS setting via hackery over the years, so > maybe I'm doing something retarded, minimal test case: > > PAGER=less LESS="--no-init --quit-if-one-screen" git branch -l > > ... > > So I

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-17 Thread Ævar Arnfjörð Bjarmason
On Thu, May 17 2018, Kaartic Sivaraam wrote: > On Thursday 17 May 2018 11:31 AM, Junio C Hamano wrote: >> * jk/branch-l-0-deprecation (2018-03-26) 3 commits >> >> ... >> >> The "-l" option in "git branch -l" is an unfortunate short-hand for >> "--create-reflog", but many users, both old and

jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

2018-05-17 Thread Kaartic Sivaraam
On Thursday 17 May 2018 11:31 AM, Junio C Hamano wrote: > * jk/branch-l-0-deprecation (2018-03-26) 3 commits > > ... > > The "-l" option in "git branch -l" is an unfortunate short-hand for > "--create-reflog", but many users, both old and new, somehow expect > it to be something else, perhaps

What's cooking in git.git (May 2018, #02; Thu, 17)

2018-05-17 Thread 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