Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Hi Jacob, Jacob Keller writes: > On Wed, Apr 11, 2018 at 6:13 AM, Sergey Organov wrote: >> It was rather --recreate-merges just a few weeks ago, and I've seen >> nobody actually commented either in favor or against the >> --rebase-merges. >> >> git

Re: [PATCH v4] git{,-blame}.el: remove old bitrotting Emacs code

Ævar Arnfjörð Bjarmason writes: > However, since downstream packagers such as Debian are packaging this > as git-el it's less disruptive to still carry these files as Elisp > code that'll error out with a message suggesting alternatives, rather > than drop the files

Re: [Git] recursive merge on 'master' severely broken?

Elijah Newren writes: > On Wed, Apr 11, 2018 at 12:19 AM, Junio C Hamano wrote: >> It appears that a topic recently graduated to 'master' introduces a >> severe regression to "git merge" when it merges a side branch that >> renames paths while the trunk has

[PATCH 10/15] replace-object: add repository argument to lookup_replace_object

Add a repository argument to allow callers of lookup_replace_object to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 06/15] refs: add repository argument to get_main_ref_store

Add a repository argument to allow the get_main_ref_store caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 11/15] refs: store the main ref store inside the repository struct

This moves the 'main_ref_store', which was a global variable in refs.c into the repository struct. This patch does not deal with the parts in the refs subsystem which deal with the submodules there. A later patch needs to get rid of the submodule exposure in the refs API, such as

[PATCH 09/15] replace-object: add repository argument to do_lookup_replace_object

Add a repository argument to allow the do_lookup_replace_object caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 08/15] replace-object: add repository argument to prepare_replace_object

Add a repository argument to allow the prepare_replace_object caller to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 05/15] replace-object: check_replace_refs is safe in multi repo environment

In ecef23 (inline lookup_replace_object() calls, 2011-05-15) a shortcut for checking the object replacement was added by setting check_replace_refs to 0 once the replacements were evaluated to not exist. This works fine in with the assumption of only one repository in existence. The

[PATCH 04/15] replace-object: eliminate replace objects prepared flag

Make the oidmap a pointer. That way we eliminate the need for the global boolean variable 'replace_object_prepared' as we can put this information into the pointer being NULL or not. Another advantage of this is that we would more quickly catch code that tries to access replace-map without

[PATCH 03/15] object-store: move lookup_replace_object to replace-object.h

lookup_replace_object is a low-level function that most users of the object store do not need to use directly. Move it to replace-object.h to avoid a dependency loop in an upcoming change to its inline definition that will make use of repository.h. Signed-off-by: Stefan Beller

[PATCH 12/15] refs: allow for_each_replace_ref to handle arbitrary repositories

Signed-off-by: Stefan Beller --- refs.c | 4 ++-- refs.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index 36df1bc73a..9b56fa9b81 100644 --- a/refs.c +++ b/refs.c @@ -1415,9 +1415,9 @@ int refs_for_each_fullref_in(struct ref_store

[PATCH 14/15] replace-object: allow do_lookup_replace_object to handle arbitrary repositories

Signed-off-by: Stefan Beller --- replace-object.h | 4 ++-- replace_object.c | 7 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/replace-object.h b/replace-object.h index dff57bfa1e..3520fd7ff7 100644 --- a/replace-object.h +++ b/replace-object.h @@

[PATCH 02/15] replace-object: move replace_map to object store

The relationship between an object X and another object Y that replaces the object X is defined only within the scope of a single repository. The exception in reachability rule around these replacement objects is also local to a repository (i.e. if traversal from refs reaches X, then both X and Y

[PATCH 15/15] replace-object: allow lookup_replace_object to handle arbitrary repositories

Signed-off-by: Stefan Beller --- replace-object.h | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/replace-object.h b/replace-object.h index 3520fd7ff7..9f607a929b 100644 --- a/replace-object.h +++ b/replace-object.h @@ -23,14 +23,14 @@ extern

[PATCH 13/15] replace-object: allow prepare_replace_object to handle arbitrary repositories

Signed-off-by: Stefan Beller --- replace_object.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/replace_object.c b/replace_object.c index adfed78901..eae52c66f3 100644 --- a/replace_object.c +++ b/replace_object.c @@ -31,18 +31,16 @@ static

[PATCH 07/15] refs: add repository argument to for_each_replace_ref

Add a repository argument to allow for_each_replace_ref callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCHv3 00/15] replace_object.c: rename to use dash in file name

v3: * interdiff below, the only changes are renaming the variable - struct ref_store *main_ref_store; + struct ref_store *refs; in struct repository. as well as dropping the file rename patch. * improved commit messages from discussion on the single patches. v2: This

[PATCH 01/15] replace_object: use oidmap

From: René Scharfe Load the replace objects into an oidmap to allow for easy lookups in constant time. Signed-off-by: Rene Scharfe Signed-off-by: Stefan Beller --- replace_object.c | 76 ++-- 1 file

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

On Wed, Apr 11, 2018 at 6:13 AM, Sergey Organov wrote: > It was rather --recreate-merges just a few weeks ago, and I've seen > nobody actually commented either in favor or against the > --rebase-merges. > > git rebase --rebase-merges > I'm going to jump in here and say that

Re: [PATCH v2 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

I haven't studied and thought about the motivation behind these two patches, but one thing I noticed... Ben Peart writes: > diff --git a/dir.c b/dir.c > index 63a917be45..1aa639b9f4 100644 > --- a/dir.c > +++ b/dir.c > @@ -1102,6 +1103,12 @@ int

Re: [PATCH] Create '--merges-only' option for 'git bisect'

On Wed, Apr 11, 2018 at 3:55 PM, Harald Nordgren wrote: > When ran with '--merges-only', git bisect will only look at merge commits -- > commits with 2 or more parents or the initial commit. There has been quite some talk on the mailing list, e.g.

Re: [PATCH v2 03/10] commit: add generation number to struct commmit

Derrick Stolee writes: > How about we do a slightly different > arrangement for these overflow commits? > > Instead of storing the commits in the commit-graph file as "0" (which > currently means "written by a version of git that did not compute > generation numbers") we could

Re: [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent

Eric Sunshine writes: > On Wed, Apr 11, 2018 at 2:07 PM, Stefan Beller wrote: >> On Wed, Apr 11, 2018 at 10:57 AM, Harald Nordgren >> wrote: >>> There have been no new comments for the last few days. I know Jeff >>> King

Re: [PATCH v3] git-svn: allow empty email-address using authors-prog and authors-file

Eric Wong writes: > Andreas Heiduk wrote: >> Am 05.04.2018 um 09:51 schrieb Eric Wong: >> > Can you confirm it's OK for you? Thanks. >> >> Looks good, works for me. >> >> Do you squash this patch with with my commit or do you need a reroll? > > Nope, no

Re: [PATCH 0/6] Rename files to use dashes instead of underscores

On Tue, Apr 10, 2018 at 02:26:15PM -0700, Stefan Beller wrote: > This is the followup for > https://public-inbox.org/git/xmqqbmer4vfh@gitster-ct.c.googlers.com/ > > We have no files left with underscores in their names. This series looked good to me. It's a nice change. -- brian m.

[PATCH] Create '--merges-only' option for 'git bisect'

When ran with '--merges-only', git bisect will only look at merge commits -- commits with 2 or more parents or the initial commit. Signed-off-by: Harald Nordgren --- Notes: Proof of concept of a feature that I have wanted in Git for a while. In my daily work my

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

From: "Eric Sunshine" Monday, April 09, 2018 6:17 AM On Mon, Mar 26, 2018 at 12:55 PM, Nguyễn Thái Ngọc Duy wrote: This is pretty rough but I'd like to see how people feel about this first. I notice we have two places for command classification.

[PATCH v4 1/3] fast-import: rename mem_pool type to mp_block

This is part of a patch series to extract the memory pool logic in fast-import into a more generalized version. The existing mem_pool type maps more closely to a "block of memory" (mp_block) in the more generalized memory pool. This commit renames the mem_pool to mp_block to reduce churn in future

fixup! [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index ee1c509bd3..6593b58299 100644 --- a/Documentation/git-diff.txt +++

Re: [PATCH v6 0/6] worktree: teach "add" to check out existing branches

On Wed, Apr 11, 2018 at 4:50 PM, Thomas Gummerer wrote: > And just as I'm re-reading my commit messages, I guess there was one > more motivation for printing the "HEAD is now at ..." line ourselves: > > If the '--no-checkout' flag is given, the output of 'git worktree

fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

- reflow some paragraphs --- Documentation/githooks.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index be31376767..ab5ce80e13 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt

fixup! [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

- add linkgit: to callers of hooks - change 'git-foo' and similar to `git foo` - add some more `` for fsmonitor --- Documentation/githooks.txt | 101 +++-- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/Documentation/githooks.txt

Re: [PATCH 1/6] doc: fix formatting inconsistency in githooks.txt

So the following two fixups should cleanup that page considerably.

Re: [PATCH v8 03/14] commit-graph: add format document

Derrick Stolee writes: > +CHUNK DATA: > + > + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) > + The ith entry, F[i], stores the number of OIDs with first > + byte at most i. Thus F[255] stores the total > + number of commits (N). > + > + OID Lookup (ID:

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

On Wed, Apr 11 2018, Jakub Narebski wrote: > Junio C Hamano writes: > > >> * ab/nuke-emacs-contrib (2018-03-13) 1 commit >> (merged to 'next' on 2018-03-15 at 13eb4e2d8b) >> + git{,-blame}.el: remove old bitrotting Emacs code >> >> The scripts in contrib/emacs/ have

Re: [PATCH v6 0/6] worktree: teach "add" to check out existing branches

On 04/11, Thomas Gummerer wrote: > On 04/09, Eric Sunshine wrote: > > On Mon, Apr 9, 2018 at 3:30 PM, Thomas Gummerer > > wrote: > > > On 04/08, Eric Sunshine wrote: > > >> As with Junio, I'm fine with this hidden option (for now), however, I > > >> think you can take this

Re: [PATCH v6 0/6] worktree: teach "add" to check out existing branches

On Wed, Apr 11, 2018 at 4:09 PM, Thomas Gummerer wrote: > On 04/09, Eric Sunshine wrote: >> Another solution would be not to augment the "HEAD is now at..." >> message at all. I realize that that augmentation was one of the >> original motivations for this patch series, but

Re: [PATCH resend] SubmittingPatches: mention the git contacts command

On 4/11/2018 4:20 PM, Thomas Gummerer wrote: Instead of just mentioning 'git blame' and 'git shortlog', which make it quite hard for new contributors to pick out the appropriate list of people to cc on their patch series, mention the 'git contacts' utility, which makes it much easier to get a

Re: [PATCH resend] SubmittingPatches: mention the git contacts command

On Wed, Apr 11, 2018 at 4:20 PM, Thomas Gummerer wrote: > Instead of just mentioning 'git blame' and 'git shortlog', which make it > quite hard for new contributors to pick out the appropriate list of > people to cc on their patch series, mention the 'git contacts' utility,

[PATCH v4] git{,-blame}.el: remove old bitrotting Emacs code

The git-blame.el mode has been superseded by Emacs's own vc-annotate (invoked by C-x v g). Users of the git.el mode are now much better off using either Magit or the Git backend for Emacs's own VC mode. These modes were added over 10 years ago when Emacs's own Git support was much less mature,

Re: [PATCH] specify encoding for sed command

I found another (possibly better) way to fix this: > On Apr 10, 2018, at 3:18 AM, Matt Coleman wrote: > >> 1) What platform OS / version / sed version is this on? > I'm experiencing this on macOS Sierra (10.12.6). The issue occurs with the > OS's native sed, which is

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

Junio C Hamano writes: > * ab/nuke-emacs-contrib (2018-03-13) 1 commit > (merged to 'next' on 2018-03-15 at 13eb4e2d8b) > + git{,-blame}.el: remove old bitrotting Emacs code > > The scripts in contrib/emacs/ have outlived their usefulness and > have been removed. > >

Re: [PATCH v2 0/4] Lazy-load trees when reading commit-graph

Derrick Stolee writes: > On 4/7/2018 2:40 PM, Jakub Narebski wrote: >> Derrick Stolee writes: >> >> [...] >>> On the Linux repository, performance tests were run for the following >>> command: >>> >>> git log --graph --oneline -1000 >>> >>>

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Hi Sergey, On Wed, 11 Apr 2018, Sergey Organov wrote: > The RFC v2 and Phillip's strategy are essentially the same, as has been > already shown multiple times, both theoretically and by testing. No, they are not. I am really tired of repeating myself here, as I have demonstrated it at length,

Re: [PATCH v2 04/10] commit-graph: compute generation numbers

On Wed, Apr 11, 2018 at 6:02 AM, Derrick Stolee wrote: > On 4/10/2018 10:51 PM, Junio C Hamano wrote: >> >> Derrick Stolee writes: >> >>> + if ((*list)->generation != GENERATION_NUMBER_INFINITY) { >>> + if

[PATCH resend] SubmittingPatches: mention the git contacts command

Instead of just mentioning 'git blame' and 'git shortlog', which make it quite hard for new contributors to pick out the appropriate list of people to cc on their patch series, mention the 'git contacts' utility, which makes it much easier to get a reasonable list of contacts for a change. This

Re: [PATCH v6 0/6] worktree: teach "add" to check out existing branches

On 04/09, Eric Sunshine wrote: > On Mon, Apr 9, 2018 at 3:30 PM, Thomas Gummerer wrote: > > On 04/08, Eric Sunshine wrote: > >> As with Junio, I'm fine with this hidden option (for now), however, I > >> think you can take this a step further. Rather than having a (hidden) >

[PATCH v2 2/2] fsmonitor: switch to use new fsexcludes logic and remove unused untracked cache based logic

Update fsmonitor to utilize the new fsexcludes based logic for excluding paths that do not need to be scaned for new or modified files. Remove the old logic in dir.c that utilized the untracked cache (if enabled) to accomplish the same goal. Signed-off-by: Ben Peart ---

[PATCH v2 0/2] fsexcludes: Add programmatic way to exclude files

Updated to incorporate feedback from V1. I'd really like a close review of the changes in dir.c where I added the calls to fsexcludes_is_excluded_from(). While they work and pass all the git tests as well as our internal functional tests, I'd like to be sure I haven't missed anything. Base Ref:

Re: [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent

On Wed, Apr 11, 2018 at 2:07 PM, Stefan Beller wrote: > On Wed, Apr 11, 2018 at 10:57 AM, Harald Nordgren > wrote: >> There have been no new comments for the last few days. I know Jeff >> King will be away for the next two weeks, but should we still

[PATCH v2 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

The File System Excludes module is a new programmatic way to exclude files and folders from git's traversal of the working directory. fsexcludes_init() should be called with a string buffer that contains a NUL separated list of path names of the files and/or directories that should be included.

Re: [PATCH 0/6] Compute and consume generation numbers

On 4/11/2018 3:32 PM, Jakub Narebski wrote: What would you suggest as a good test that could imply performance? The Google Colab notebook linked to above includes a function to count number of commits (nodes / vertices in the commit graph) walked, currently in the worst case scenario. The two

Re: [PATCH v1 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

On 4/10/2018 6:09 PM, Martin Ågren wrote: On 10 April 2018 at 23:04, Ben Peart wrote: The File System Excludes module is a new programmatic way to exclude files and folders from git's traversal of the working directory. fsexcludes_init() should be called with a

Re: [PATCH 0/6] Compute and consume generation numbers

Derrick Stolee writes: > On 4/7/2018 12:55 PM, Jakub Narebski wrote: >> Currently I am at the stage of reproducing results in FELINE paper: >> "Reachability Queries in Very Large Graphs: A Fast Refined Online Search >> Approach" by Renê R. Veloso, Loïc Cerf, Wagner Meira Jr and

Reply Immediately

Good Day My name is Benjamin Joseph, an accountant with C Bank UK, there is an opportunity in our bank that I would like us to talk about so we can join hands together to achieve it for our benefit. please get back to me for details. Thanks you Benjamin Joseph.

Re: [PATCH v2 04/10] commit-graph: compute generation numbers

On Wed, Apr 11, 2018 at 9:02 AM, Derrick Stolee wrote: > On 4/10/2018 10:51 PM, Junio C Hamano wrote: >> In case we want to do the "we know this is very large, but we do not >> know the exact value", we may actually want a mode where we can >> pretend that GENERATION_NUMBER_MAX

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood wrote: > On 10/04/18 13:30, Johannes Schindelin wrote: >> +The `reset` command is essentially a `git reset --hard` to the specified >> +revision (typically a previously-labeled one). > > s/labeled/labelled/ American vs.

[PATCH v4 2/3] fast-import: introduce mem_pool type

Introduce the mem_pool type which encapsulates all the information necessary to manage a pool of memory. This change moves the existing variables in fast-import used to support the global memory pool to use this structure. It also renames variables that are no longer used by memory pools to

[PATCH v4 3/3] Move reusable parts of memory pool into its own file

This moves the reusable parts of the memory pool logic used by fast-import.c into its own file for use by other components. Signed-off-by: Jameson Miller --- Makefile | 1 + fast-import.c | 70 +-- mem-pool.c

[PATCH v4 0/3] Extract memory pool logic into reusable component

Thank you everyone for taking the time review and provide feedback on this patch series. Changes from v3: - Based patch off of new commit, to resolve merge conflict. - Updated log message in 2/3 based on feedback. - Squashed patch from Ramsay Jones into 2/3 to fix warning from

Re: [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent

Hi Stefan, Stefan Beller wrote: > Please see the "What's cooking?" email on the mailing list that is > sent out periodically by Junio. > the last one is > https://public-inbox.org/git/xmqqd0z865pk@gitster-ct.c.googlers.com/ > which says: > >> * jk/ref-array-push (2018-04-09) 3 commits >> -

Re: [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent

Hi Harald, On Wed, Apr 11, 2018 at 10:57 AM, Harald Nordgren wrote: > There have been no new comments for the last few days. I know Jeff > King will be away for the next two weeks, but should we still move > forward with this? The initial reactions to the idea seemed

Hey

Do you need a loan

Re: [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent

There have been no new comments for the last few days. I know Jeff King will be away for the next two weeks, but should we still move forward with this? The initial reactions to the idea seemed positive. Best regards Harald On Mon, Apr 9, 2018 at 3:42 AM, Harald Nordgren

Re: Is offloading to GPU a worthwhile feature?

Konstantin Ryabitsev writes: > On 04/08/18 09:59, Jakub Narebski wrote: >>> This is an entirely idle pondering kind of question, but I wanted to >>> ask. I recently discovered that some edge providers are starting to >>> offer systems with GPU cards in them --

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Wed, 11 Apr 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> [...] >> >> > We disallow '#' as label because that character will be used as >> > separator in

Re: [Git] recursive merge on 'master' severely broken?

On Wed, Apr 11, 2018 at 12:19 AM, Junio C Hamano wrote: > It appears that a topic recently graduated to 'master' introduces a > severe regression to "git merge" when it merges a side branch that > renames paths while the trunk has further updates. > > The symptom can easily be

Targeted Global B2B Companies Emails List

Hi, Did you get a chance to review my below email? Kindly let me know your requirements and I will get back with detailed information on the same. Warm Regards, Larry Clinton

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

On 10/04/18 13:30, Johannes Schindelin wrote: Firstly let me say that I think expanding the documentation and having an example is an excellent idea. + + +label onto + +# Branch: refactor-button +reset onto +pick 123456 Extract a generic Button class from the DownloadButton one

Re: [PATCH 6/8] gpg-interface: find the last gpg signature line

On Tue, Apr 10, 2018 at 4:17 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >>> That test was fixed a week ago: >>> https://github.com/git/git/commit/a99d903f21d102a5768f19157085a9733aeb68dd >> >> Well, you cannot expect any reviewer to know about a

Re: Great Investment Offer

Hello In my search for a business partner i got your contact in google search. My client is willing to invest $10 Million to $500 million but my client said he need a trusted partner who he can have a meeting at the point of releasing his funds. I told my client that you have a good profile

Re: [PATCH v2 06/10] commit.c: use generation to halt paint walk

On 4/10/2018 11:02 PM, Junio C Hamano wrote: Derrick Stolee writes: @@ -800,17 +810,26 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n, struc return result; } prio_queue_put(, one); + if

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Johannes Schindelin writes: > Hi Sergey, > > On Wed, 11 Apr 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> > On Tue, 10 Apr 2018, Sergey Organov wrote: >> > >> >> Johannes Schindelin writes:

Re: [PATCH v2 04/10] commit-graph: compute generation numbers

On 4/10/2018 10:51 PM, Junio C Hamano wrote: Derrick Stolee writes: + if ((*list)->generation != GENERATION_NUMBER_INFINITY) { + if ((*list)->generation > GENERATION_NUMBER_MAX) + die("generation number

Re: [PATCH v2 03/10] commit: add generation number to struct commmit

On 4/10/2018 10:31 PM, Junio C Hamano wrote: Derrick Stolee writes: The generation number of a commit is defined recursively as follows: * If a commit A has no parents, then the generation number of A is one. * If a commit A has parents, then the generation number of A

Re: [PATCH v2 02/10] merge: check config before loading commits

On 4/10/2018 10:12 PM, Junio C Hamano wrote: Derrick Stolee writes: diff --git a/builtin/merge.c b/builtin/merge.c index ee050a47f3..20897f8223 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1183,13 +1183,14 @@ int cmd_merge(int argc, const char **argv, const

Great News!!!

You Won $950,500.00 USD on Amnesty International Kenya online E-mail Promotion. For more details about your prize claims, file with the following; Names: Country: Tel: Regards, Mr. David Ford

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

Hi Sergey, On Wed, 11 Apr 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > > We disallow '#' as label because that character will be used as > > separator in the upcoming `merge` command. > > Please consider to use # not only in `merge` and

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Hi Sergey, On Wed, 11 Apr 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > On Tue, 10 Apr 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > >> > Once upon a time, I dreamt of an interactive rebase

Re: What's cooking in git.git (Apr 2018, #01; Mon, 9)

On 09/04/18 11:21, Junio C Hamano wrote: * pw/add-p-select (2018-03-16) 3 commits (merged to 'next' on 2018-03-30 at eae69f5ded) + add -p: optimize line selection for short hunks + add -p: allow line selection to be inverted + add -p: select individual hunk lines "git add -p"

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

> diff --git a/gpg-interface.h b/gpg-interface.h > index a5e6517ae6..cee0dfe401 100644 > --- a/gpg-interface.h > +++ b/gpg-interface.h > @@ -23,15 +23,27 @@ struct signature_check { > char *key; > }; > > +struct signing_tool { > + char *name; > + char *program; > + struct

Great News!!!

You Won $950,500.00 USD on Amnesty International Kenya online E-mail Promotion. For more details about your prize claims, file with the following; Names: Country: Tel: Regards, Mr. David Ford

Re: [Git] recursive merge on 'master' severely broken?

Junio C Hamano writes: > Another interim report. > > I do not yet know which one of the ~30 individual commmits is the > real culprit, ... It bisects down to c5b761fb ("merge-recursive: ensure we write updates for directory-renamed file", 2018-02-14); given that a part of the

Re: Is support for 10.8 dropped?

On Wed, Apr 11, 2018 at 12:28 AM, Igor Korot wrote: >>> Is there a way to check for OpenSSL presence? >> >> Not sure what you're asking. Are you asking how to determine if you >> already have OpenSSL built on your machine? > > Yes, that's what I was asking... Easiest way to

Re: [Git] recursive merge on 'master' severely broken?

Junio C Hamano writes: > It appears that a topic recently graduated to 'master' introduces a > severe regression to "git merge" when it merges a side branch that > renames paths while the trunk has further updates. > ... > I suspect that the culprit is the merge e4bb62fa

Re: core.fsmonitor always perform rescans

2018-04-10 23:34 GMT+09:00 Ben Peart : > As a performance optimization, the fsmonitor code doesn't flag the index as > dirty and force it to be written out with every command. Can you try > performing a git operation (add, rm, commit, etc) that will write out an > updated

[Git] recursive merge on 'master' severely broken?

It appears that a topic recently graduated to 'master' introduces a severe regression to "git merge" when it merges a side branch that renames paths while the trunk has further updates. The symptom can easily be seen by trying to recreate the merge I made at the tip of 'pu' 29dea678 ("Merge

Re: [PATCH v8 0/5] RUNTIME_PREFIX relocatable Git

On Tue, Apr 10 2018, Dan Jacques wrote: > This is a minor update based on comments from the v6 series. > I'm hoping this set is good to go! This looks to me. Thanks! > - Rebased on top of "master". Probably useful for others to have the interdiff between this and v7. Here it is: $

Re: [PATCH v1 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

Ben Peart writes: > +void fsexcludes_free() { Write this line like so: void fsexcludes_free(void) { > +void fsexcludes_free(); void fsexcludes_free(void);

[PATCH v3 1/1] perl: fix installing modules from contrib

Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. v2: Pass prefix as that can have influence

Re: [PATCH v8 0/5] RUNTIME_PREFIX relocatable Git

Dan Jacques writes: > This is a minor update based on comments from the v6 series. > I'm hoping this set is good to go! > > This patch set expands support for the RUNTIME_PREFIX configuration flag, > currently only used on Windows builds, to include Linux, Darwin, and > FreeBSD.

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

Hi Johannes, Johannes Schindelin writes: [...] > We disallow '#' as label because that character will be used as separator > in the upcoming `merge` command. Please consider to use # not only in `merge` and `reset`, but in the rest of the commands as well, to unify