Re: Recommendation for consistent update on invoke of "sha1_to_hex()"

On Fri, Jan 05, 2018 at 11:26:01AM +0800, 牛旭 wrote: > By mining historical patches, we suggest that invokes of sha1_to_hex() > should be replaced with that of oid_to_hex(). One example for > recommendation and corresponding patch are listed as follows.  Note that these two functions take

Re: Patch recommendation for replace invoke of error() to that of error_errno()

On Fri, Jan 05, 2018 at 11:24:02AM +0800, 牛旭 wrote: > Our team researches on consistent update of Git during evolution. And > we have figured out several spots that may be missed.  > > > By mining historical patches, we suggest that invokes of error(..., > strerror(errno)) should be replaced

Re: [BUG] v2.16.0-rc0 seg faults when git bisect skip

Hi, On Fri, Jan 5, 2018 at 11:45 AM, Yasushi SHOJI wrote: > So that I can make a test case. OK, here is the step to reproduce on git.git $ git bisect start $ git bisect bad v2.16.0-rc0 $ git bisect good 0433d533f13671f4313c31e34707f0f5281a18e0 $ git bisect good $ git

Re: Bring together merge and rebase

On Thu, Jan 04, 2018 at 10:09:19PM -0700, Carl Baldwin wrote: > This would be very cool. I've wanted to tackle this for a long time. I > think I even filed an issue with gerrit about this years ago. Yep, it turned out that it was a duplicate but I described what I did to work around it.

Re: Bug report: git clone with dest

Hello Johannes, Jeff, I cloned git's codebase, applied the four patches on master, built and tested on Ubuntu Trusty. (After verifying that master indeed exhibits this behaviour on Linux as well. Just checking). Seems to work fine. I also looked at the code. Most of the patched lines relate to

Re: Bring together merge and rebase

On Thu, Jan 04, 2018 at 12:19:34PM -0700, Martin Fick wrote: > On Tuesday, December 26, 2017 12:40:26 AM Jacob Keller > wrote: > > On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin > wrote: > > >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin > wrote: > >

Re: Bring together merge and rebase

On Thu, Jan 04, 2018 at 01:06:27PM -0700, Martin Fick wrote: > On Tuesday, December 26, 2017 01:31:55 PM Carl Baldwin > wrote: > ... > > What I propose is that gerrit and github could end up more > > robust, featureful, and interoperable if they had this > > feature to build from. > > I agree

RE

my name is Mrs. Alice Walton, a business woman an America Citizen and the heiress to the fortune of Walmart stores, born October 7, 1949. I have a mission for you worth $100,000,000.00(Hundred Million United State Dollars) which I intend using for CHARITY

Re: [PATCH] git-archive: accept --owner and --group like GNU tar

Dear Junio, Could you tell me your thought about the way for me to go? Do you agree with his suggestion; "--uid etc is not the right solution, --include-untracked is better and generic" ? Or, should I work "--uid etc" further? Regards, mpsuzuki Junio C Hamano wrote: René Scharfe

Re: Bring together merge and rebase

On Thu, Jan 04, 2018 at 12:54:00PM -0700, Martin Fick wrote: > On Monday, December 25, 2017 06:16:40 PM Carl Baldwin wrote: > > On Sun, Dec 24, 2017 at 10:52:15PM -0500, Theodore Ts'o > wrote: > > Look at what happens in a rebase type workflow in any of > > the following scenarios. All of these

Recommendation for consistent update on invoke of "sha1_to_hex()"

Our team researches on consistent update of Git during evolution. And we have figured out several spots that may be missed.  By mining historical patches, we suggest that invokes of sha1_to_hex() should be replaced with that of oid_to_hex(). One example for recommendation and corresponding

Patch recommendation for replace invoke of error() to that of error_errno()

Our team researches on consistent update of Git during evolution. And we have figured out several spots that may be missed.  By mining historical patches, we suggest that invokes of error(..., strerror(errno)) should be replaced with that of error_errno(). One example for recommendation and

Re: [BUG] v2.16.0-rc0 seg faults when git bisect skip

Hi, On Thu, Jan 4, 2018 at 3:26 AM, Martin Ågren wrote: > On 3 January 2018 at 15:21, Ævar Arnfjörð Bjarmason wrote: >> >> On Wed, Jan 03 2018, Yasushi SHOJI jotted: >> >>> Hi, >>> >>> git version 2.16.0.rc0 seg faults on my machine when I >>> [...] >>>

Happy new year!

Good Day, How are u doing today ? Apologies! I am a military woman ,seeking your kind assistance to move the sum of ($7M USD) to you, as far as i can be assured that my money will be safe in your care until i complete my service here in Afghanistan and come over next month. This is legitimate, and

Re: Bring together merge and rebase

> On Jan 4, 2018 11:19 AM, "Martin Fick" wrote: > > On Tuesday, December 26, 2017 12:40:26 AM Jacob Keller > > > > wrote: > > > On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin > > > > wrote: > > > >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin > > >

Re: [PATCH 3/4] clone: factor out dir_exists() helper

On Thu, Jan 04, 2018 at 06:54:12PM -0500, Jeff King wrote: > > If we really want to be anal, perhaps a new helper path_exists() > > that cares only about existence of paths (i.e. the implementation of > > these two helpers they currently have), together with update to > > check the st.st_mode for

Re: Rewrite cat-file.c : need help to find a bug

On Thu, Jan 4, 2018 at 11:23 PM, Оля Тележная wrote: > > So for now 2 of my last commits fail, and I am tired of searching for the > error. > I was also trying to leave cat_file_info variable and fill in both new > and old variables and then compare resulting values by

Re: [PATCH 3/4] clone: factor out dir_exists() helper

On Thu, Jan 04, 2018 at 03:47:18PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Two parts of git-clone's setup logic check whether a > > directory exists, and they both call stat directly with the > > same scratch "struct stat" buffer. Let's pull that into a > > helper,

Re: [PATCH 4/4] clone: do not clean up directories we didn't create

Jeff King writes: > diff --git a/builtin/clone.c b/builtin/clone.c > index 04b0d7283f..284651797e 100644 > --- a/builtin/clone.c > +++ b/builtin/clone.c > @@ -502,12 +504,12 @@ static void remove_junk(void) > > if (junk_git_dir) { > strbuf_addstr(,

Re: [PATCH 3/4] clone: factor out dir_exists() helper

Jeff King writes: > Two parts of git-clone's setup logic check whether a > directory exists, and they both call stat directly with the > same scratch "struct stat" buffer. Let's pull that into a > helper, which has a few advantages: > > - it makes the purpose of the stat calls

Re: Bug report: git clone with dest

Hi Isaac, On Wed, 3 Jan 2018, Isaac Shabtay wrote: > Indeed interesting... this one's for the books... > Thanks for the patches. Any idea when these are going to make it to > the official Git client builds? (specifically the Windows one) If you help them getting reviewed, tested, and validated,

Re: [PATCH v3 0/5] Add --no-ahead-behind to status

On Wed, Jan 03, 2018 at 09:47:28PM +, Jeff Hostetler wrote: > Config values of true and false control non-porcelain formats > for compatibility reasons as previously discussed. In the > last commit I added a new value of 2 for the config setting > to allow porcelain formats to inherit the

Re: [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later

Hi Alex, On Tue, 2 Jan 2018, Alex Vandiver wrote: > diff --git a/config.c b/config.c > index e617c2018..7c6ed888e 100644 > --- a/config.c > +++ b/config.c > @@ -2174,8 +2174,13 @@ int git_config_get_fsmonitor(void) > if (core_fsmonitor && !*core_fsmonitor) > core_fsmonitor =

[PATCHv2 6/6] diff: use HAS_MULTI_BITS instead of counting bits manually

This aligns the style to the previous patch. Signed-off-by: Stefan Beller --- diff.c | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index 42858d4c7d..c2ee81a1fa 100644 --- a/diff.c +++ b/diff.c @@ -4107,20 +4107,15 @@

[PATCHv2 2/6] diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit

Currently flags for pickaxing are found in different places. Unify the flags into the `pickaxe_opts` field, which will contain any pickaxe related flags. Signed-off-by: Stefan Beller --- diff.h | 3 ++- diffcore-pickaxe.c | 6 +++--- revision.c | 2 +- 3

[PATCHv2 3/6] diff: introduce DIFF_PICKAXE_KINDS_MASK

Currently the check whether to perform pickaxing is done via checking `diffopt->pickaxe`, which contains the command line argument that we want to pickaxe for. Soon we'll introduce a new type of pickaxing, that will not store anything in the `.pickaxe` field, so let's migrate the check to be

[PATCHv2 5/6] diff: properly error out when combining multiple pickaxe options

In f506b8e8b5 (git log/diff: add -G that greps in the patch text, 2010-08-23) we were hesitant to check if the user requests both -S and -G at the same time. Now that the pickaxe family also offers --find-object, which looks slightly more different than the former two, let's add a check that those

[PATCHv2 4/6] diffcore: add a pickaxe option to find a specific blob

Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) One might be tempted to extend git-describe to also work with blobs, such that `git describe ` gives a description as ':'. This was

[PATCHv2 1/6] diff.h: Make pickaxe_opts an unsigned bit field

This variable is used as a bit field[1], and as we are about to add more fields, indicate its usage as a bit field by making it unsigned. [1] containing the bits #define DIFF_PICKAXE_ALL1 #define DIFF_PICKAXE_REGEX 2 #define DIFF_PICKAXE_KIND_S 4 #define DIFF_PICKAXE_KIND_G

[PATCHv2 0/6] pickaxe refactorings and a new mode to find blobs (WAS: diffcore: add a pickaxe option to find a specific blob)

v2: Thanks Junio and Jacob for review! * fixed up the last patch to rephrase the error message to contain an 'and' * use HAS_MULTI_BITS as well * a bonus patch that uses HAS_MULTI_BITS for the existing code, too. v1 After some discussion [1], we're convinced that the original approach for adding

Re: [PATCH 6/6] fsmonitor: Use fsmonitor data in `git diff`

Hi Alex, On Tue, 2 Jan 2018, Alex Vandiver wrote: > diff --git a/diff-lib.c b/diff-lib.c > index 8104603a3..13ff00d81 100644 > --- a/diff-lib.c > +++ b/diff-lib.c > @@ -95,6 +95,9 @@ int run_diff_files(struct rev_info *revs, unsigned int > option) > > diff_set_mnemonic_prefix(>diffopt,

[PATCHv3 3/4] builtin/blame: add option to color metadata fields separately

Unlike the previous commit, this dims colors for each metadata field individually. Signed-off-by: Stefan Beller --- builtin/blame.c | 83 - t/t8012-blame-colors.sh | 38 ++ 2 files changed, 113

[PATCHv3 4/4] builtin/blame: highlight recently changed lines

Choose a different color for dates and imitate a 'temperature cool down' depending upon age. Originally I had planned to have the temperature cooldown dependent on the age of the project or file for example, as that might scale better, but that can be added on top of this commit, e.g. instead of

[PATCHv3 1/4] color.h: document and modernize header

Add documentation explaining the functions in color.h. While at it, mark them extern. Signed-off-by: Stefan Beller --- color.c | 2 -- color.h | 58 -- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git

[PATCHv3 0/4] blame: (dim rep. metadata lines or fields, decay date coloring)

v3: Thanks Eric for feedback, I implemented all of the suggestions. Specifically I dropped the abstractions in patch2 but keep around a similar abstraction in patch 3 as that still looks like it benefits (the condition is just growing large). Thanks, Stefan v2: This is picking up [1], but

[PATCHv3 2/4] builtin/blame: dim uninteresting metadata

When using git-blame lots of lines contain redundant information, for example in hunks that consist of multiple lines, the metadata (commit name, author, date) are repeated. A reader may not be interested in those, so offer an option to color the information that is repeated from the previous line

Re: [PATCH 4/6] fsmonitor: Make output of test-dump-fsmonitor more concise

Hi Alex, On Tue, 2 Jan 2018, Alex Vandiver wrote: > Rather than display one very long line, summarize the contents of that > line. The tests do not currently rely on any content except the first > line ("no fsmonitor" / "fsmonitor last update"). The more interesting part would be the entries

Re: [PATCH 2/6] fsmonitor: Stop inline'ing mark_fsmonitor_valid / _invalid

Hi Alex, On Tue, 2 Jan 2018, Alex Vandiver wrote: > These were inline'd when they were first introduced, presumably as an > optimization for cases when they were called in tight loops. This > complicates using these functions, as untracked_cache_invalidate_path > is defined in dir.h. > > Leave

Re: Rewrite cat-file.c : need help to find a bug

2017-12-29 17:04 GMT+03:00 Оля Тележная : > 2017-12-29 16:22 GMT+03:00 Jeff King : >> On Fri, Dec 29, 2017 at 01:05:50PM +0300, Оля Тележная wrote: >> >>> Hi everyone, >>> I am trying to reuse formatting logic from ref-filter in cat-file >>> command. Now

Re: [RFC PATCH 2/2] Remove now useless email-address parsing code

Matthieu Moy writes: > We now use Mail::Address unconditionaly, hence parse_mailboxes is now > dead code. Remove it and its tests. > > Signed-off-by: Matthieu Moy > --- > perl/Git.pm | 71 >

Re: [PATCH 2/4] builtin/blame: dim uninteresting metadata

On Thu, Dec 28, 2017 at 2:29 PM, Eric Sunshine wrote: > On Thu, Dec 28, 2017 at 4:03 PM, Stefan Beller wrote: >> When using git-blame lots of lines contain redundant information, for >> example in hunks that consist of multiple lines, the metadata

Re: [PATCH v3 2/5] status: add --[no-]ahead-behind to status and commit for V2 format.

Jeff Hostetler writes: > + sti = stat_tracking_info(branch, _ahead, _behind, > + , s->ahead_behind_flags); > if (base) { > base = shorten_unambiguous_ref(base, 0); >

Previous hunk in different file during add --patch

I keep expecting that pressing K during patch add that it will cross file boundaries and go to previous hunks in files before the current one. However, it reports "no hunks" when reaching the top hunk in the current file. Is there a way to go to the previous file?

Re: [PATCH v3 1/5] stat_tracking_info: return +1 when branches not equal

Jeff Hostetler writes: > - if (stat_tracking_info(branch, _ours, > -_theirs, NULL)) { > + if (stat_tracking_info(branch, _ours, _theirs, > +NULL, AHEAD_BEHIND_FULL) < 0) { >

Re: [ANNOUNCE] Git v2.16.0-rc0

On Thu, 2018-01-04 at 20:18 +, Thomas Gummerer wrote: > On 12/29, Paul Smith wrote: > > On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > > > * The way "git worktree add" determines what branch to create > > > from where and checkout in the new worktree has been updated a > > > bit.

[PATCH] rebase -p: fix quoting when calling `git merge`

It has been reported that strategy arguments are not passed to `git merge` correctly when rebasing interactively, preserving merges. The reason is that the strategy arguments are already quoted, and then quoted again. This fixes https://github.com/git-for-windows/git/issues/1321

Re: [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files

On Wed, Jan 3, 2018 at 5:52 PM, SZEDER Gábor wrote: >> + test $(git rev-parse :0:y/b) = $(git rev-parse O:z/b) && > > There is a test helper for that :) > > test_cmp_rev :0:y/b O:z/b > > Note, that this is not only a matter of useful output on failure, but >

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

Hi Matwey, On Mon, 1 Jan 2018, Matwey V. Kornilov wrote: > Hello, > > I am running git 2.15.1 and facing the following issue with linux kernel > tree. > > # git checkout v3.8 > # git branch abc-3.8 > # git checkout v3.9 > # git branch abc-3.9 > # git checkout abc-3.8 > > Introduce new commit

Re: [RFC PATCH 1/2] add a local copy of Mail::Address from CPAN

On Thu, Jan 4, 2018 at 1:55 PM, Matthieu Moy wrote: > We used to have two versions of the email parsing code. Our > parse_mailboxes (in Git.pm), and Mail::Address which we used if > installed. Unfortunately, both versions have different sets of bugs, and > changing the

Re: Test failure for v2.16.0-rc0 on cygwin

Hi, On Tue, 2 Jan 2018, Ramsay Jones wrote: > On 02/01/18 15:32, Ramsay Jones wrote: > > On 02/01/18 11:36, Adam Dinwoodie wrote: > >> On Saturday 30 December 2017 at 02:40 pm +, Adam Dinwoodie wrote: > >>> On Saturday 30 December 2017 at 02:21 pm +, Ramsay Jones wrote: > [snip] > >> I'm

Re: [PATCH 28/40] pack-objects: don't pack objects in external odbs

On 1/3/2018 11:33 AM, Christian Couder wrote: Objects managed by an external ODB should not be put into pack files. They should be transfered using other mechanism that can be specific to the external odb. Signed-off-by: Christian Couder --- builtin/pack-objects.c

Re: [ANNOUNCE] Git v2.16.0-rc0

Hi, On Thu, 28 Dec 2017, Junio C Hamano wrote: > An early preview release Git v2.16.0-rc0 is now available for > testing at the usual places. And a corresponding Git for Windows prerelease is also available: https://github.com/git-for-windows/git/releases/tag/v2.16.0-rc0.windows.1 Ciao,

Re: Bug/feature request: Can’t disable fsck warnings during clone

Hi Kevin, On Thu, 28 Dec 2017, Kevin A. Mitchell wrote: > I’ve set transfer.fsckObjects to true globally, for safety. > Unfortunately, this messed up my Spacevim install. > > Doing some digging, I found that some of the repos had a warning. I > can turn the warning off, but that only affects

Re: [ANNOUNCE] Git v2.16.0-rc0

On 12/29, Paul Smith wrote: > On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > > * The way "git worktree add" determines what branch to create from > >where and checkout in the new worktree has been updated a bit. > > Does this include the enhancements published a few weeks ago to

Re: [PATCH v2 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/18, Lars Schneider wrote: > > > On 17 Dec 2017, at 23:51, Thomas Gummerer wrote: > > > > Split index mode only has a few dedicated tests, but as the index is > > involved in nearly every git operation, this doesn't quite cover all the > > ways repositories with split

Re: Bring together merge and rebase

On Tuesday, December 26, 2017 01:31:55 PM Carl Baldwin wrote: ... > What I propose is that gerrit and github could end up more > robust, featureful, and interoperable if they had this > feature to build from. I agree (assuming we come up with a well defined feature) > With gerrit specifically,

Re: [PATCH 01/40] Add initial external odb support

On 1/3/2018 11:33 AM, Christian Couder wrote: The external-odb.{c,h} files will contain the functions that are called by the rest of Git mostly from "sha1_file.c" to access the objects managed by the external odbs. The odb-helper.{c,h} files will contain the functions to actually implement

Re: [PATCH 15/40] external-odb: add script mode support

On 1/3/2018 11:33 AM, Christian Couder wrote: This adds support for the script command mode where an helper script or command is called to retrieve or manage objects. This implements the 'have' and 'get_git_obj' instructions for the script mode. Signed-off-by: Christian Couder

Re: Bring together merge and rebase

On Monday, December 25, 2017 06:16:40 PM Carl Baldwin wrote: > On Sun, Dec 24, 2017 at 10:52:15PM -0500, Theodore Ts'o wrote: > Look at what happens in a rebase type workflow in any of > the following scenarios. All of these came up regularly > in my time with Gerrit. > > 1. Make a quick

Re: [PATCH 1/4] color.h: document and modernize header

On Thu, Dec 28, 2017 at 2:00 PM, Eric Sunshine wrote: > On Thu, Dec 28, 2017 at 4:03 PM, Stefan Beller wrote: >> Add documentation explaining the functions in color.h. >> While at it, mark them extern. >> >> Signed-off-by: Stefan Beller

Re: Bring together merge and rebase

On Sunday, December 24, 2017 12:01:38 AM 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

[RFC PATCH 2/2] Remove now useless email-address parsing code

We now use Mail::Address unconditionaly, hence parse_mailboxes is now dead code. Remove it and its tests. Signed-off-by: Matthieu Moy --- perl/Git.pm | 71 t/t9000-addresses.sh | 27

[PATCH v4 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 v4 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 v4 0/7] increase wildmatch test coverage

This fixes errors in v3 that caused failures on bash & on Windows. Ævar Arnfjörð Bjarmason (7): wildmatch test: indent with tabs, not spaces wildmatch test: use more standard shell style wildmatch test: don't try to vertically align our output wildmatch test: use a paranoia pattern from

[PATCH v4 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 v4 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 v4 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 v4 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

[PATCH v4 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 commands 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

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

On Wed, Dec 27, 2017 at 09:41:30AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I, too, had a funny feeling about calling this "core". But I didn't have > > a better name, as I'm not sure what other place we have for config > > options that cross many command

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

2018-01-04 21:57 GMT+03:00 Junio C Hamano : > "Matwey V. Kornilov" writes: > >> It seems there is some issue with double escaping: >> ... >>> # git rebase --preserve-merges -s recursive -Xdiff-algorithm=patience >>> --onto abc-3.8 v3.8 abc-3.9 >>> >>>

Re: Bring together merge and rebase

On Tuesday, December 26, 2017 12:40:26 AM Jacob Keller wrote: > On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin wrote: > >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin wrote: > >> A bit of a tangent here, but a thought I didn't wanna > >> lose: In the

[RFC PATCH 1/2] add a local copy of Mail::Address from CPAN

We used to have two versions of the email parsing code. Our parse_mailboxes (in Git.pm), and Mail::Address which we used if installed. Unfortunately, both versions have different sets of bugs, and changing the behavior of git depending on whether Mail::Address is installed was a bad idea. A first

Re: [PATCH v2 2/3] prune: fix pruning with multiple worktrees and split index

Thomas Gummerer writes: > [sorry for the late reply. I was on Christmas holidays until today > and am still catching up on the mailing list. It will probably take > me untill the weekend to send a re-roll] > > On 12/18, Brandon Williams wrote: >> On 12/17, Thomas Gummerer

Re: Misleading documentation for git-diff-files (diff-filter)

Thanks for the clarification! I also didn't realize that diff-files -R will show added files. You learn something new everyday ;) On Thu, Jan 4, 2018 at 11:09 AM, Junio C Hamano wrote: > Jeff King writes: > >> diff --git a/Documentation/diff-options.txt

Re: Misleading documentation for git-diff-files (diff-filter)

Jeff King writes: > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index 9d1586b956..743af97b06 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -469,6 +469,12 @@ ifndef::git-format-patch[] > + > Also,

Re: [RFC/PATCH] connect: add GIT_SSH_{SEND,RECEIVE}{,_COMMAND} env variables

Jeff King writes: > I get that you may have two different keys to go with two different > identities on a remote system. But I'm not sure I understand why > "sending" or "receiving" is the right way to split those up. Wouldn't > you also sometimes want to fetch from repository X?

Re: [PATCH] doc/SubmittingPatches: improve text formatting

"brian m. carlson" writes: > On Tue, Jan 02, 2018 at 10:33:50AM -0500, Todd Zullinger wrote: >> 049e64aa50 ("Documentation: convert SubmittingPatches to AsciiDoc", >> 2017-11-12) changed the `git blame` and `git shortlog` examples given in >> the section on sending

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

"Matwey V. Kornilov" writes: > It seems there is some issue with double escaping: > ... >> # git rebase --preserve-merges -s recursive -Xdiff-algorithm=patience >> --onto abc-3.8 v3.8 abc-3.9 >> >> And then I see: >> >> fatal: Unknown option for merge-recursive:

Re: [PATCH] perf: amend the grep tests to test grep.threads

Ævar Arnfjörð Bjarmason writes: > Ever since 5b594f457a ("Threaded grep", 2010-01-25) the number of > threads git-grep uses under PTHREADS has been hardcoded to 8, but > there's no performance test to check whether this is an optimal > setting. > > Amend the existing tests for

Re: [PATCH v2 2/2] Windows: stop supplying BLK_SHA1=YesPlease by default

On Thu, Jan 04 2018, Johannes Schindelin jotted: > Hi, > > On Thu, 28 Dec 2017, Ævar Arnfjörð Bjarmason wrote: > >> Using BLK_SHA1 in lieu of the OpenSSL routines was done in >> 9bccfcdbff ("Windows: use BLK_SHA1 again", 2009-10-22), since DC_SHA1 >> is now the default for git in general it

Re: [PATCH] git-archive: accept --owner and --group like GNU tar

René Scharfe writes: > I don't know if it's a good idea, but perhaps we don't even need a new > option. We could change how pathspecs of untracked files are handled: > Instead of aborting we could include them in the archive. (Sounds like > the simplest possible interface, but

Re: [PATCH 14/40] sha1_file: prepare for external odbs

On 1/3/2018 11:33 AM, Christian Couder wrote: In the following commits we will need some functions that were internal to sha1_file.c, so let's first make them non static and declare them in "cache.h". While at it, let's rename 'create_tmpfile()' to 'create_object_tmpfile()' to make its name

Re: [PATCH 10/40] external-odb: implement external_odb_get_direct

On 1/3/2018 11:33 AM, Christian Couder wrote: This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder --- external-odb.c | 15 +++ external-odb.h | 1 + odb-helper.c | 13 +

Re: [PATCH 2/2] Windows: stop supplying BLK_SHA1=YesPlease by default

Hi, On Thu, 28 Dec 2017, Ævar Arnfjörð Bjarmason wrote: > On Wed, Dec 27 2017, Jonathan Nieder jotted: > > > +git-for-windows > > Ævar Arnfjörð Bjarmason wrote: > > > >> Using BLK_SHA1 in lieu of the OpenSSL routines was done in [1], but > >> since DC_SHA1 is now the default for git in general

Re: [PATCH v2 2/2] Windows: stop supplying BLK_SHA1=YesPlease by default

Hi, On Thu, 28 Dec 2017, Ævar Arnfjörð Bjarmason wrote: > Using BLK_SHA1 in lieu of the OpenSSL routines was done in > 9bccfcdbff ("Windows: use BLK_SHA1 again", 2009-10-22), since DC_SHA1 > is now the default for git in general it makes sense for Windows to > use that too, this looks like

[PATCH] utf8.c: mark utf{16,32}_{be,le}_bom symbols static

Signed-off-by: Ramsay Jones --- Hi Lars, If you need to re-roll your 'ls/checkout-encoding' branch, could you please squash this into the relevant patch (commit d5318db2d0, "utf8: add function to detect prohibited UTF-16/32 BOM", 2017-12-31). [yes, noticed by

Re: [RFC/PATCH] connect: add GIT_SSH_{SEND,RECEIVE}{,_COMMAND} env variables

On Thu, Jan 04 2018, Jeff King jotted: > On Thu, Jan 04, 2018 at 11:10:17AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> That's badly explained, sorry, when I say "push" I mean "push and/or >> pull". >> >> I don't know about Github, but on Gitlab when you provision a deploy key >> and associate it

Re: [PATCH] git-archive: accept --owner and --group like GNU tar

Am 04.01.2018 um 03:25 schrieb suzuki toshiya: > Taking a glance on parse-options.h, I could not find the > existing class collecting the operands as an array (or > linked list) from multiple "--xxx=yyy" options. Similar > things might be the collecting the pathnames to pathspec > structure.

Re: Misleading documentation for git-diff-files (diff-filter)

On Thu, Jan 04, 2018 at 07:53:53AM -0800, John Cheng wrote: > To be clear, I don't mean to imply that diff-files should include > files that are not the index. I was trying to say that as a user, the > documentation gave me a different impression. > > For background, my intent was to have a

Re: Misleading documentation for git-diff-files (diff-filter)

To be clear, I don't mean to imply that diff-files should include files that are not the index. I was trying to say that as a user, the documentation gave me a different impression. For background, my intent was to have a script to look for local git repos that with unstaged changes. After some

Re: [RFC/PATCH] connect: add GIT_SSH_{SEND,RECEIVE}{,_COMMAND} env variables

On Thu, Jan 04, 2018 at 11:10:17AM +0100, Ævar Arnfjörð Bjarmason wrote: > That's badly explained, sorry, when I say "push" I mean "push and/or > pull". > > I don't know about Github, but on Gitlab when you provision a deploy key > and associate it with a repo it must be *globally* rw or ro,

Re: Bring together merge and rebase

Hi, On Sun, 24 Dec 2017, Alexei Lozovsky wrote: > 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

Hello

My name is Heather ten Broeke from Atlanta Georgia i have a project for you contact my private email :heatherbrooeke1...@gmail.com for details.

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

Hi, It seems there is some issue with double escaping: 14:57:18.524010 git.c:344 trace: built-in: git 'merge' '--no-log' '--no-ff' '--strategy=recursive' '-X' ''\''diff-algorithm=p atience'\''' '-m' 'Merge branch '\''core-rcu-for-linus'\'' of

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

On Wednesday 03 January 2018 at 08:14 pm +0100, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Jan 03 2018, Adam Dinwoodie jotted: > > > On Wednesday 03 January 2018 at 02:31 pm +0100, Ævar Arnfjörð Bjarmason > > wrote: > >> Does the fixup above in <878tdm8k2d@evledraar.gmail.com> work for > >>

Re: [RFC/PATCH] connect: add GIT_SSH_{SEND,RECEIVE}{,_COMMAND} env variables

On Thu, Jan 04 2018, Jeff King jotted: > On Thu, Jan 04, 2018 at 01:08:28AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> Hopefully this is clearer, and depending on how the rest of the >> discussion goes I'll submit v2 with something like this in the commit >> message: >> >> SSH keys A and B are