Re: Bring together merge and rebase

On Fri, Dec 22, 2017 at 11:10:19PM -0700, Carl Baldwin wrote: > I've been calling this proposal `git replay` or `git replace` but I'd > like to hear other suggestions for what to name it. It works like > rebase except with one very important difference. Instead of orphaning > the original commit,

PLEASE I NEED YOUR HELP FOR SCHOOL!

Dear Sir/Madam, Good day ! Please permit me to introduce myself, I am MIMI IBRAHIM COULIBALY 17 years old female from the Republic of Ivory Coast, in Abidjan; I'm the Daughter of Late Chief Sgt. Ibrahim Coulibaly (A.K.A General Warlord IB ). My late Father was a well known Ivory Coast military

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

Ævar Arnfjörð Bjarmason wrote: > I think for any given external dependency of git.git it makes sense to > just pick a version, not say that this script requires perl so-and-so, > this one python so-and-so, or curl/openssl so-and-so etc. Agreed. Any version support changes

[PATCH v2 5/7] wildmatch test: remove dead fnmatch() test code

Remove the unused fnmatch() test parameter from the wildmatch test. The code that used to test this was removed in 70a8fc999d ("stop using fnmatch (either native or compat)", 2014-02-15). As a --word-diff shows the only change to the body of the tests is the removal of the second out of four

[PATCH v2 6/7] wildmatch test: perform all tests under all wildmatch() modes

Rewrite the wildmatch() test suite so that each test now tests all combinations of the wildmatch() WM_CASEFOLD and WM_PATHNAME flags. Before this change some test inputs were not tested on e.g. WM_PATHNAME. Now the function is stress tested on all possible inputs, and for each input we declare

[PATCH v2 3/7] wildmatch test: don't try to vertically align our output

Don't try to vertically align the test output, which is futile anyway under the TAP output where we're going to be emitting a number for each test without aligning the test count. This makes subsequent changes of mine where I'm not going to be aligning this output as I add new tests easier.

[PATCH v2 7/7] wildmatch test: create & test files on disk in addition to in-memory

There has never been any full roundtrip testing of what git-ls-files and other functions that use wildmatch() actually do, rather we've been satisfied with just testing the underlying C function. Due to git-ls-files and friends having their own codepaths before they call wildmatch() there's

[PATCH v2 0/7] increase wildmatch test coverage

This v2 addresses comments by Johannes Sixt in <8f4cdb23-8e2e-144a-1f70-99776b027...@kdbg.org> and there's osme other cleanups as noted below. Ævar Arnfjörð Bjarmason (7): wildmatch test: indent with tabs, not spaces wildmatch test: use more standard shell style No changes. wildmatch

[PATCH v2 4/7] wildmatch test: use a paranoia pattern from nul_match()

Use a pattern from the nul_match() function in t7008-grep-binary.sh to make sure that we don't just fall through to the "else" if there's an unknown parameter. This is something I added in commit 77f6f4406f ("grep: add a test helper function for less verbose -f \0 tests", 2017-05-20) to grep

[PATCH v2 2/7] wildmatch test: use more standard shell style

Change the wildmatch test to use more standard shell style, usually we use "if test" not "if [". Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3070-wildmatch.sh | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/t/t3070-wildmatch.sh

[PATCH v2 1/7] wildmatch test: indent with tabs, not spaces

Replace the 4-width mixed space & tab indentation in this file with indentation with tabs as we do in most of the rest of our tests. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3070-wildmatch.sh | 54 ++-- 1 file changed, 27

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

On Sun, Dec 24 2017, Eric Wong jotted: [Removed Petr Baudis from CC, his suse.cz E-Mail address is bouncing] > Ævar Arnfjörð Bjarmason wrote: >> On Sun, Dec 24 2017, Jeff King jotted: >> > As far as this actual perl change goes, I don't have a strong opinion.

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

Ævar Arnfjörð Bjarmason wrote: > On Sun, Dec 24 2017, Jeff King jotted: > > As far as this actual perl change goes, I don't have a strong opinion. I > > agree it would be nice to eventually move forward, and your reasoning > > about what constitutes "old" seems sane. But we also

Re: [PATCH] setup.c: move statement under condition

On Sun, Dec 24 2017, Kevin Daudt jotted: > On Sun, Dec 24, 2017 at 12:15:35PM +0400, Vadim Petrov wrote: >> Thank you for your replay. >> >> > I have to be honest: this commit message (including the subject) left me >> > quite puzzled as to the intent of this patch. >> >> I still only learn

Re: [PATCH] setup.c: move statement under condition

On Sun, Dec 24, 2017 at 12:15:35PM +0400, Vadim Petrov wrote: > Thank you for your replay. > > > I have to be honest: this commit message (including the subject) left me > > quite puzzled as to the intent of this patch. > > I still only learn English and correctly express my thoughts while

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

On Sun, Dec 24 2017, Jeff King jotted: > On Sat, Dec 23, 2017 at 05:44:00PM +, Ævar Arnfjörð Bjarmason wrote: > >> This is similar to Jeff King's jk/drop-ancient-curl series in that >> we're dropping perl releases that are rarely tested anymore, however >> unlike those patches git still

RE: Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file())

On December 24, 2017 9:54 AM, Jeff King wrote: > Subject: Re: Improved error handling (Was: [PATCH 1/2] sequencer: factor > out rewrite_file()) > > On Sat, Nov 18, 2017 at 10:01:45AM +0100, Johannes Sixt wrote: > > > > Yeah, I have mixed feelings on that. I think it does make the > > > control

Re: Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file())

On Sat, Nov 18, 2017 at 10:01:45AM +0100, Johannes Sixt wrote: > > Yeah, I have mixed feelings on that. I think it does make the control > > flow less clear. At the same time, what I found was that handlers like > > die/ignore/warn were the thing that gave the most reduction in > > complexity in

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

On Sat, Dec 23, 2017 at 05:44:00PM +, Ævar Arnfjörð Bjarmason wrote: > This is similar to Jeff King's jk/drop-ancient-curl series in that > we're dropping perl releases that are rarely tested anymore, however > unlike those patches git still works on e.g. 5.8.8 (I couldn't build > anything

Re: [PATCH v2 1/5] core.aheadbehind: add new config setting

On Fri, Dec 22, 2017 at 10:21:23AM -0800, Junio C Hamano wrote: > >> +core.aheadbehind:: > >> + If true, tells commands like status and branch to print ahead and > >> + behind counts for the branch relative to its upstream branch. > >> + This computation may be very expensive when there is a

Re: [PATCH] revision: introduce prepare_revision_walk_extended()

On Thu, Dec 21, 2017 at 07:41:44PM +0100, René Scharfe wrote: > Am 20.12.2017 um 14:08 schrieb Jeff King: > > On Tue, Dec 19, 2017 at 10:33:55AM -0800, Junio C Hamano wrote: > > > >> Should we take the patch posted as-is and move forward? > > > > I suppose so. I don't really have anything

Re: Bring together merge and rebase

On Dec 24, 2017, at 01:01, Johannes Schindelin wrote: > > Hi Carl, > > On Sat, 23 Dec 2017, Carl Baldwin wrote: > >> I imagine that a "git commit --amend" would also insert a "replaces" >> reference to the original commit but I failed to mention that in my >> original post. > > And

GREETINGS,

GREETINGS, I AM BORTE ,I WAS DIAGNOSE OF OVARIAN CANCER,WHICH DOCTORS HAVE CONFIRMED THAT I HAVE ONLY FEW WEEKS TO LIVE, SO I HAVE DECIDED TO DONATE EVERYTHING I HAVE TO THE ORPHANAGE AND THE POOR WIDOWS THROUGH YOU .PLEASE KINDLY REPLY ME ONLY ON MY EMAIL ADDRES HERE

Re: Re: Unify annotated and non-annotated tags

From: "anatoly techtonik" From: Philip Oakley > So if I understand correctly, the hope is that `git show-ref --tags` > could > get an alternate option `--all-tags` [proper option name required...] > such > that the user would not have to develop the rather over the

Re: [RFC/PATCH] perl: bump the required Perl version to 5.10.0 from 5.8.0

On Sat, Dec 23 2017, brian m. carlson jotted: > On Sat, Dec 23, 2017 at 05:44:00PM +, Ævar Arnfjörð Bjarmason wrote: >> The reason to do this is to be able to use features released with perl >> in the last decade, 5.10 was a major feature release including things >> like new regex features,

Re: [PATCH 6/6] wildmatch test: create & test files on disk in addition to in-memory

Am 24.12.2017 um 12:06 schrieb Ævar Arnfjörð Bjarmason: On Sun, Dec 24 2017, Johannes Sixt jotted: Am 23.12.2017 um 22:30 schrieb Ævar Arnfjörð Bjarmason: + printf '%s' '$text' >expect && There are no single-quotes in any $text instances, right? There's not,

Re: [PATCH 6/6] wildmatch test: create & test files on disk in addition to in-memory

On Sun, Dec 24 2017, Johannes Sixt jotted: > Am 23.12.2017 um 22:30 schrieb Ævar Arnfjörð Bjarmason: >> Signed-off-by: Ævar Arnfjörð Bjarmason >> --- >> a[]b | 0 >> t/t3070-wildmatch.sh | 336 >> --- >> 2

[PATCH 1/2] fast-export: ensure proper order of modify, copy and rename entries

From: Mark Nauwelaerts As b3e8ca8 ("fast-export: do not copy from modified file", 2017-09-20) indicates, if a commit both modifies a file and uses it as a source for a copy, then the specifications of git-fast-import require that the copy should be reported first

[PATCH 0/2] restore fast-export full filecopy detection

From: Mark Nauwelaerts When using fast-export/fast-import to interface/bridge with another VCS that explicitly tracks copy/rename as metadata, fast-export's ability to report filecopy/filerename is quite useful (if not essential). There has been a fix in this area

[PATCH 2/2] fast-export: remove now obsolete filtering of modified files

From: Mark Nauwelaerts Revert b3e8ca8 ("fast-export: do not copy from modified file", 2017-09-20) partially, since it is not necessary to filter out 'C' commands if the 'M' and 'C' commands are in correct order. The unit test that was added is kept around though,

Re: [PATCH 6/6] wildmatch test: create & test files on disk in addition to in-memory

Am 23.12.2017 um 22:30 schrieb Ævar Arnfjörð Bjarmason: > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > a[]b | 0 > t/t3070-wildmatch.sh | 336 > --- > 2 files changed, 319 insertions(+), 17 deletions(-) >

Re: [PATCH] setup.c: move statement under condition

Thank you for your replay. > I have to be honest: this commit message (including the subject) left me > quite puzzled as to the intent of this patch. I still only learn English and correctly express my thoughts while somewhat difficult. > If you also have a background story that motivated you