Re: [PATCH v2 0/5] Create commit-graph file format v2

2019-04-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 26 2019, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> On Wed, Apr 24 2019, Derrick Stolee via GitGitGadget wrote: >> >>> NOTE: this series was rebased onto ab/commit-graph-fixes, as the conflicts >>> were significant and subtle. >> >> Sorry, hopefully it helped more

Re: How to undo previously set configuration? (again)

2019-04-26 Thread Duy Nguyen
On Thu, Apr 25, 2019 at 9:36 PM Jonathan Nieder wrote: > > Hi, > > Ævar Arnfjörð Bjarmason wrote: > > > Because we don't have some general config facility for this it keeps > > coming up, and various existing/proposed options have their own little > > custom hacks for doing it, e.g. this for Barre

[PATCH] rebase --abort: cleanup refs/rewritten

2019-04-26 Thread Phillip Wood
From: Phillip Wood When `rebase -r` finishes it removes any refs under refs/rewritten that it has created. However if the rebase is aborted these refs are not removed. This can cause problems for future rebases. For example I recently wanted to merge a updated version of a topic branch into an in

[PATCH] rebase -r: always reword merge -c

2019-04-26 Thread Phillip Wood
From: Phillip Wood If a merge can be fast-forwarded then make sure that we still edit the commit message if the user specifies -c. The implementation follows the same pattern that is used for ordinary rewords that are fast-forwarded. Signed-off-by: Phillip Wood --- sequencer.c |

Re: [PATCH 2/5] fast-import: support 'encoding' commit header

2019-04-26 Thread Elijah Newren
Hi Eric, On Thu, Apr 25, 2019 at 1:37 PM Eric Sunshine wrote: > > On Thu, Apr 25, 2019 at 11:51 AM Elijah Newren wrote: > > Since git supports commit messages with an encoding other than utf-8, > > allow fast-import to import such commits. This may be useful for folks > > who do not want to ree

[PATCH 1/1] commit-graph: improve error messages

2019-04-26 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The error messages when reading a commit-graph have a few problems: 1. Some values are output in hexadecimal, but that is not made clear by the message. Prepend "0x" to these values. 2. The version number does not need to be hexadecimal, and also should mention a "max

[PATCH 0/1] commit-graph: improve error messages

2019-04-26 Thread Derrick Stolee via GitGitGadget
Here is a small patch that revises the error messages from ab/commit-graph-fixes, as recommended by Ævar. Hopefully, it can be merged faster than the commit-graph v2 stuff, and I can update that series to include this change if we agree it is a good one. Thanks, -Stolee Cc: ava...@gmail.com In-R

Re: [PATCH v2 0/5] Create commit-graph file format v2

2019-04-26 Thread Derrick Stolee
On 4/26/2019 4:33 AM, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Apr 26 2019, Junio C Hamano wrote: >> >> Thanks always for your careful review and thoughtful comments, by >> the way. I agree that these comments are extremely helpful. >>> Now as noted in my series we now on 'master' downgrade th

Re: [PATCH 1/1] commit-graph: improve error messages

2019-04-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 26 2019, Derrick Stolee via GitGitGadget wrote: > The error messages when reading a commit-graph have a few problems: > > 1. Some values are output in hexadecimal, but that is not made >clear by the message. Prepend "0x" to these values. > > 2. The version number does not need to

Your COMPENSATION PAYMENT OF $5 MILLION/ (EFCC) FOREIGN OPERATIONS DEPT

2019-04-26 Thread info
We wish to inform you of your abandoned fund which has been approved and is ready for payout. Please respond to enable the payout department (E.F.C.C) to contact you with more details. Mr John Ron E-mail: johnronconsult...@aliyun.com Sincerely, Mr. Ibrahim Mustafa Magu CHAIRMAN ECONOMIC & FINA

Re: [PATCH v2 0/5] Create commit-graph file format v2

2019-04-26 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 26 2019, Derrick Stolee wrote: > On 4/26/2019 4:33 AM, Ævar Arnfjörð Bjarmason wrote: >> >> On Fri, Apr 26 2019, Junio C Hamano wrote: >>> >>> Thanks always for your careful review and thoughtful comments, by >>> the way. > > I agree that these comments are extremely helpful. >

Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-26 Thread Johannes Schindelin
Hi Peff, On Fri, 12 Apr 2019, Jeff King wrote: > On Fri, Apr 12, 2019 at 04:04:39PM -0700, Rohit Ashiwal via GitGitGadget > wrote: > > > From: Rohit Ashiwal > > > > MinGit for Windows comes without `gzip` bundled inside, git-archive uses > > `gzip -cn` to compress tar files but for this to work

Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-26 Thread Johannes Schindelin
Hi Junio, On Sat, 13 Apr 2019, Junio C Hamano wrote: > Jeff King writes: > > >> +/* writes out the whole block, or dies if fails */ > >> +static void write_block_or_die(const char *block) { > >> + if (gzip) { > >> + if (gzwrite(gzip, block, (unsigned) BLOCKSIZE) != BLOCKSIZE) > >> +

Re: Request to add option to interactive rebase to preserve latest commit date

2019-04-26 Thread Junio C Hamano
Jeff Schwartz writes: > Using interactive rebase has one flaw IMHO and that is the way it > handles dating its commit. Can you add an option to interactive rebase > that would make it use the date from the commit that is most recent > and not the date from the commit that is the oldest? I am not

[PATCH] make slash-rules more readable

2019-04-26 Thread Dr. Adam Nielsen
--- Documentation/gitignore.txt | 37 - 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index b5bc9dbff0..3a6fb9117c 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-26 Thread Johannes Schindelin
Hi Peff, On Fri, 12 Apr 2019, Jeff King wrote: > On Fri, Apr 12, 2019 at 04:04:40PM -0700, Rohit Ashiwal via GitGitGadget > wrote: > > > From: Rohit Ashiwal > > > > As we already link to the zlib library, we can perform the compression > > without even requiring gzip on the host machine. > > Ve

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-26 Thread Johannes Schindelin
Hi Peff, On Mon, 15 Apr 2019, Jeff King wrote: > On Sun, Apr 14, 2019 at 12:01:10AM +0200, René Scharfe wrote: > > > >> As we already link to the zlib library, we can perform the compression > > >> without even requiring gzip on the host machine. > > > > > > Very cool. It's nice to drop a depende

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-26 Thread Johannes Schindelin
Hi brian, On Sat, 13 Apr 2019, brian m. carlson wrote: > On Fri, Apr 12, 2019 at 09:51:02PM -0400, Jeff King wrote: > > I wondered how you were going to kick this in, since users can define > > arbitrary filters. I think it's kind of neat to automagically convert > > "gzip -cn" (which also happen

Re: How to undo previously set configuration? (again)

2019-04-26 Thread Ævar Arnfjörð Bjarmason
On Thu, Apr 25 2019, Ævar Arnfjörð Bjarmason wrote: > On Thu, Apr 25 2019, Duy Nguyen wrote: > >> On Thu, Apr 25, 2019 at 5:08 PM Ævar Arnfjörð Bjarmason >> wrote: >>> >> Solving (1) without (2) feels like a bit of a missed opportunity to >>> >> me. Ideally, what I would like is >>> >> >>> >>

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-26 Thread Kaartic Sivaraam
Hi Junio, On 26 April 2019 11:11:38 GMT+05:30, Junio C Hamano wrote: > >Unfortunately, I do not know how to ask GitHub web UI to give us a >simple "log --oneline" equivalent of list like gitweb did (sadly >cgit is not much better wrt this), but I think clicking on the >parent link starting from

add 'ls-remote' option to limit output records

2019-04-26 Thread David Carson
Given that 'ls-remote' can be sorted, it would be useful to be able to ask for a subset of the total number of result records. For example, if I want to retrieve only the tag with the highest version, I would do so by adding this new option (-n1 in my example): $ git ls-remote -n1 --tag

HELLO DEAR

2019-04-26 Thread Ahmed
With Due Respect, I know that this mail will come to you as a surprise as we have never met before, but need not to worry as I am contacting you independently of my investigation and no one is informed of this communication. I need your urgent assistance in transferring the sum of $11.3million

[PATCH v2 0/3] allow checkout and branch to create branches on a merge base

2019-04-26 Thread Denton Liu
Thanks for your comments, Eric and Junio. Eric, I've combined the `test_when_finished` calls together so that the statements within appear in a more "logical" order. Junio, I've taken your suggestion and moved the change into `create_branch`. Initially, I didn't want to do this because I didn't w

[PATCH v2 2/3] t2018: demonstrate checkout -b merge base bug

2019-04-26 Thread Denton Liu
In git-checkout.txt, it states As a special case, you may use `"A...B"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. However, there exists a bug where

[PATCH v2 1/3] t2018: cleanup in current test

2019-04-26 Thread Denton Liu
Before, in t2018, if do_checkout failed to create `branch2`, the next test-case would run `git branch -D branch2` but then fail because it was expecting `branch2` to exist, even though it doesn't. As a result, an early failure could cause a cascading failure of tests. Make test-case responsible fo

[PATCH v2 3/3] branch: make create_branch accept a merge base rev

2019-04-26 Thread Denton Liu
When we ran something like $ git checkout -b test master... it would fail with the message fatal: Not a valid object name: 'master...'. This was caused by the call to `create_branch` where `start_name` is expected to be a valid rev. However, git-checkout allows the branch to be a valid

Re: add 'ls-remote' option to limit output records

2019-04-26 Thread Bryan Turner
On Fri, Apr 26, 2019 at 11:57 AM David Carson wrote: > > Given that 'ls-remote' can be sorted, it would be useful to be able to ask > for a subset of the total number of result records. > > For example, if I want to retrieve only the tag with the highest version, I > would do so by adding this n

[ANNOUNCE] Git Rev News edition 50

2019-04-26 Thread Christian Couder
Hi everyone, The 50th edition of Git Rev News is now published: https://git.github.io/rev_news/2019/04/26/edition-50/ Thanks a lot to Luca Milanesio who contributed again this month! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [PATCH] revisions.txt: mention ~ form

2019-04-26 Thread Andreas Heiduk
Am 22.04.19 um 08:12 schrieb Denton Liu: > In revisions.txt, the '^' form is mentioned but the '~' form > is missing. Although both forms are essentially equivalent (they each > get the first parent of the specified revision), we should mention the > latter for completeness. Make this change. > >

Re: [PATCH 1/5] run-command: add preliminary support for multiple hooks

2019-04-26 Thread brian m. carlson
On Thu, Apr 25, 2019 at 09:40:34PM +0200, Johannes Sixt wrote: > Am 25.04.19 um 02:55 schrieb Junio C Hamano: > > Johannes Sixt writes: > > > >> Furthermore, basing a decision on whether a file is executable won't > >> work on Windows as intended. So, it is better to aim for an existence > >> ch

Re: [PATCH] revisions.txt: mention ~ form

2019-04-26 Thread Denton Liu
On Fri, Apr 26, 2019 at 10:55:35PM +0200, Andreas Heiduk wrote: > Am 22.04.19 um 08:12 schrieb Denton Liu: > > In revisions.txt, the '^' form is mentioned but the '~' form > > is missing. Although both forms are essentially equivalent (they each > > get the first parent of the specified revision),

[PATCH v2] builtin/merges: clarify --squash behavior with --commit

2019-04-26 Thread vishal
From: Vishal Verma Convert option_commit to tristate, representing the states of 'default/untouched', 'enabled-by-cli', 'disabled-by-cli'. With this in place, check whether option_commit was enabled by cli when squashing a merge. If so, error out, as this is not supported. Add a note to the --sq

Re: [PATCH 0/5] Fix and extend encoding handling in fast export/import

2019-04-26 Thread brian m. carlson
On Thu, Apr 25, 2019 at 09:55:11AM -0600, Elijah Newren wrote: > On Thu, Apr 25, 2019 at 9:51 AM Elijah Newren wrote: > > > > While stress testing `git filter-repo`, I noticed an issue with > > encoding; further digging led to the fixes and features in this series. > > See the individual commit me

Re: [PATCH 1/5] run-command: add preliminary support for multiple hooks

2019-04-26 Thread Johannes Sixt
Am 26.04.19 um 22:58 schrieb brian m. carlson: > On Thu, Apr 25, 2019 at 09:40:34PM +0200, Johannes Sixt wrote: > I would like to point out that we still have to perform an executability > check before we run the hook or we'll get errors printed to the user. That's fine. On Windows, when a hook is

Re: [PATCH v2 0/3] allow checkout and branch to create branches on a merge base

2019-04-26 Thread Junio C Hamano
Denton Liu writes: > Thanks for your comments, Eric and Junio. > > Eric, I've combined the `test_when_finished` calls together so that the > statements within appear in a more "logical" order. > > Junio, I've taken your suggestion and moved the change into > `create_branch`. Initially, I didn't w

Re: [ANNOUNCE] Git Rev News edition 50

2019-04-26 Thread Junio C Hamano
Christian Couder writes: > Hi everyone, > > The 50th edition of Git Rev News is now published: > > https://git.github.io/rev_news/2019/04/26/edition-50/ > > Thanks a lot to Luca Milanesio who contributed again this month! > > Enjoy, > Christian, Jakub, Markus and Gabriel. Rev News team, congra

Re: [PATCH v2 0/3] allow checkout and branch to create branches on a merge base

2019-04-26 Thread Denton Liu
On Sat, Apr 27, 2019 at 08:07:34AM +0900, Junio C Hamano wrote: > Denton Liu writes: > > > Thanks for your comments, Eric and Junio. > > > > Eric, I've combined the `test_when_finished` calls together so that the > > statements within appear in a more "logical" order. > > > > Junio, I've taken yo

Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-26 Thread Junio C Hamano
Johannes Schindelin writes: >> >> +/* writes out the whole block, or dies if fails */ >> >> +static void write_block_or_die(const char *block) { >> >> + if (gzip) { >> >> + if (gzwrite(gzip, block, (unsigned) BLOCKSIZE) != BLOCKSIZE) >> >> + die(_("gzwrite failed")); >> >>

[PATCH 2/2] format-patch: Make --base patch-id output stable

2019-04-26 Thread Stephen Boyd
We weren't flushing the context each time we processed a hunk in the patch-id generation code in diff.c, but we were doing that when we generated "stable" patch-ids with the 'patch-id' tool. Let's port that similar logic over from patch-id.c into diff.c so we can get the same hash when we're genera

[PATCH 1/2] format-patch: Inform user that patch-id generation is unstable

2019-04-26 Thread Stephen Boyd
I tried out 'git format-patch --base' with a set of commits that modifies more than one file. It turns out that the way this command is implemented it actually uses the unstable version of patch-id instead of the stable version that's documented. When I tried to modify the existing test to use 'git

Re: [PATCH v2 0/3] allow checkout and branch to create branches on a merge base

2019-04-26 Thread Denton Liu
On Fri, Apr 26, 2019 at 04:40:24PM -0700, Denton Liu wrote: [snip] > I'm going send a reroll to update the documentation to mention "..." in > and, while I'm at it, I'll do the squash. Actually, I have a quick question for you: Out of respect for your time as the maintainer (since you have a l

Re: [PATCH v2 0/3] allow checkout and branch to create branches on a merge base

2019-04-26 Thread Junio C Hamano
Denton Liu writes: > Out of respect for your time as the maintainer (since you have a lot of > topics to deal with), how do you prefer small fixups be submitted? > > * A complete reroll of the whole series > * A replacement for one patch in the series > * A follow-up email with an "oops, please c

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-26 Thread Junio C Hamano
2019年4月27日(土) 2:58 Kaartic Sivaraam : > > May be you are searching for the following view which lists (similar to git > log --one-line) the commits starting from 97dd512 which is the last in the > tb/unexpected series? > > https://github.com/git/git/commits/97dd512af7ce4afb4f638ef73b4770921c8ca3

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-26 Thread Kaartic Sivaraam
Hi Junio, On 27 April 2019 10:36:55 GMT+05:30, Junio C Hamano wrote: >2019年4月27日(土) 2:58 Kaartic Sivaraam : >> > >I can click it and reach https://github.com/git/git/commit/c49927fca0d >but then >that is more like "git show c49927fca". I can even go to its second >parent with >one click, but th