Re: [PATCH 1/3] t6010: test actual test output

On Fri, Sep 15, 2017 at 12:01:27PM +0200, Michael J Gruber wrote: > Jeff King venit, vidit, dixit 14.09.2017 16:34: > > On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote: > > > >> 4f21454b55 ("merge-base: handle --fork-point without reflog", > >> 2016-10-12) introduced a fix for

Re: Git 2.14.1: t6500: error during test on musl libc

On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote: > On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA256 > > > > Hi there, > > > > While bumping Git's version for our Linux distribution to 2.14.1, I've > > run in to a new

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

(It looks like I did not reply to this email yet, sorry about this late reply.) On Thu, Jul 6, 2017 at 7:36 PM, Ben Peart wrote: > > On 7/1/2017 3:41 PM, Christian Couder wrote: >> >> On Fri, Jun 23, 2017 at 8:24 PM, Ben Peart wrote: >>> >>> Great to see

[RFC PATCH v2 2/2] submodule: simplify decision tree whether to or not to fetch

To make extending this logic later easier. Signed-off-by: Heiko Voigt --- submodule.c | 74 ++--- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/submodule.c b/submodule.c index 38b9905e43..fa44fc59f2

Re: [PATCH v5 25/40] external-odb: add 'get_direct' support

On Thu, Sep 14, 2017 at 8:19 PM, Jonathan Tan wrote: > On Thu, 14 Sep 2017 10:39:35 +0200 > Christian Couder wrote: > >> From the following email: >> >> https://public-inbox.org/git/20170804145113.5ceaf...@twelve2.svl.corp.google.com/ >> >>

Re: how to remove from history just *one* version of a file/dir?

On Fri, Sep 15, 2017 at 07:06:43AM -0400, Robert P. J. Day wrote: > > I think you want to stick with a --tree-filter (or an > > --index-filter), but just selectively decide when to do the > > deletion. For example, if you can tell the difference between the > > two states based on the presence of

[PATCH v2] add test for bug in git-mv for recursive submodules

When using git-mv with a submodule it will detect that and update the paths for its configurations (.gitmodules, worktree and gitfile). This does not work for recursive submodules where a user renames the root submodule. We discovered this fact when working on on-demand fetch for renamed

Re: [PATCH v3] commit-template: change a message to be more intuitive

Kaartic Sivaraam venit, vidit, dixit 15.09.2017 06:50: > It's not good to use the phrase 'do not touch' to convey the information > that the cut-line should not be modified or removed as it could possibly > be mis-interpreted by a person who doesn't know that the word 'touch' has > the meaning of

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

On 15/09/17 03:48, Junio C Hamano wrote: > > Michael J Gruber writes: > >> In fact, per documentation "--fork-point" looks at the reflog in >> addition to doing the usual walk from the tip. The original design >> description in d96855ff51 ("merge-base: teach "--fork-point"

[RFC PATCH v2 1/2] implement fetching of moved submodules

We store the changed submodules paths to calculate which submodule needs fetching. This does not work for moved submodules since their paths do not stay the same in case of a moved submodules. In case of new submodules we do not have a path in the current checkout, since they just appeared in this

Re: commit-msg hook does not run on merge with --no-ff option

Valid point. The way my project is set up I always get a conflict on merge operations, so technically all my merges (except fast forward merges) end with a git-commit, which of course runs the commit-msg hook. It seems everything is working as designed. Shame there isn't a merge-msg hook. It

Re: [PATCH 1/3] t6010: test actual test output

Jeff King venit, vidit, dixit 14.09.2017 16:34: > On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote: > >> 4f21454b55 ("merge-base: handle --fork-point without reflog", >> 2016-10-12) introduced a fix for merge-base --fork-point without reflog >> and a test. While that test is fine,

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

Junio C Hamano venit, vidit, dixit 15.09.2017 04:48: > Michael J Gruber writes: > >> In fact, per documentation "--fork-point" looks at the reflog in >> addition to doing the usual walk from the tip. The original design >> description in d96855ff51 ("merge-base: teach

Re: [PATCH v3] commit-template: change a message to be more intuitive

On Fri, 2017-09-15 at 12:00 +0200, Michael J Gruber wrote: > Kaartic Sivaraam venit, vidit, dixit 15.09.2017 06:50: > > > > I didn't expect the least that this would go upto v3. In case anyboy finds That's should have been 'anybody'. > > something wrong with this change too, it's a lot better

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

(It looks like I did not reply to this other email yet, sorry about this late reply.) On Wed, Jul 12, 2017 at 9:06 PM, Jonathan Tan wrote: > On Tue, 20 Jun 2017 09:54:34 +0200 > Christian Couder wrote: > >> Git can store its objects only in

Re: [PATCH 1/2] test-lib: group system specific FIFO tests by system

Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21: > Hi Michael, > > On Thu, 14 Sep 2017, Michael J Gruber wrote: > >> test-lib determines whether a file-system supports FIFOs and needs to do >> special casing for CYGWIN and MINGW. This separates those system >> specific settings from

Re: how to remove from history just *one* version of a file/dir?

On Thu, 14 Sep 2017, Jeff King wrote: > On Thu, Sep 14, 2017 at 07:32:11AM -0400, Robert P. J. Day wrote: > > > [is this the right place to ask questions about git usage? or is > > there a different forum where one can submit possibly > > embarrassingly silly questions?] > > No, this is the

Re: [PATCH v2] config: avoid "write_in_full(fd, buf, len) < len" pattern

On 15/09/17 01:37, Jeff King wrote: > On Thu, Sep 14, 2017 at 12:31:38AM +0100, Ramsay Jones wrote: > >> I just tried it again tonight; the current master branch has 3532 >> warnings when compiled with -Wextra, 1409 of which are -Wsign-compare >> warnings. After applying the patch below, those

[PATCH] for_each_string_list_item(): behave correctly for empty list

If you pass a newly-initialized or newly-cleared `string_list` to `for_each_string_list_item()`, then the latter does for ( item = (list)->items; /* note, this is NULL */ item < (list)->items + (list)->nr; /* note: NULL + 0 */ ++item) Even though this

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

Hi Junio, On Thu, 24 Aug 2017, Junio C Hamano wrote: > Lars Schneider writes: > > > On 22 Aug 2017, at 21:56, Junio C Hamano wrote: > > > >> Here are the topics that have been cooking. Commits prefixed with > >> '-' are only in 'pu' (proposed

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

Hi Junio, On Fri, 15 Sep 2017, Junio C Hamano wrote: > -- > [Cooking] > > [...] > > * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit > . diff-delta: fix encoding size that would not fit in "unsigned int" > > The machinery

Re: [PATCH 1/2] test-lib: group system specific FIFO tests by system

Hi Michael, On Fri, 15 Sep 2017, Michael J Gruber wrote: > Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21: > > > > On Thu, 14 Sep 2017, Michael J Gruber wrote: > > > >> test-lib determines whether a file-system supports FIFOs and needs to do > >> special casing for CYGWIN and MINGW.

[PATCH 0/3] Improve abbreviation disambiguation

Hello, My name is Derrick Stolee and I just switched teams at Microsoft from the VSTS Git Server to work on performance improvements in core Git. This is my first patch submission, and I look forward to your feedback. Thanks, Stolee When displaying object ids, we frequently want to see an

[PATCH 2/3] sha1_name: Unroll len loop in find_unique_abbrev_r

Unroll the while loop inside find_unique_abbrev_r to avoid iterating through all loose objects and packfiles multiple times when the short name is longer than the predicted length. Instead, inspect each object that collides with the estimated abbreviation to find the longest common prefix.

[PATCH] Fix merge parent checking with svn.pushmergeinfo.

Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would get error messages like "merge parent for is on branch svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root svn+ssh://ja...@gcc.gnu.org/svn/gcc!" * git-svn.perl: Remove username from rooturl before

RE: [PATCH v6 05/12] fsmonitor: add documentation for the fsmonitor extension.

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner ; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com; >

[PATCH v6 02/12] preload-index: add override to enable testing preload-index

Preload index doesn't run unless it has a minimum number of 1000 files. To enable running tests with fewer files, add an environment variable (GIT_FORCE_PRELOAD_TEST) which will override that minimum and set it to 2. Signed-off-by: Ben Peart --- preload-index.c | 2 ++ 1

[PATCH v6 03/12] update-index: add a new --force-write-index option

At times, it makes sense to avoid the cost of writing out the index when the only changes can easily be recomputed on demand. This causes problems when trying to write test cases to verify that state as they can't guarantee the state has been persisted to disk. Add a new option

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

Hi Junio, On Fri, 15 Sep 2017, Junio C Hamano wrote: > * js/rebase-i-final (2017-07-27) 10 commits > - rebase -i: rearrange fixup/squash lines using the rebase--helper > - t3415: test fixup with wrapped oneline > - rebase -i: skip unnecessary picks using the rebase--helper > - rebase -i:

[PATCH v6 01/12] bswap: add 64 bit endianness helper get_be64

Add a new get_be64 macro to enable 64 bit endian conversions on memory that may or may not be aligned. Signed-off-by: Ben Peart --- compat/bswap.h | 22 ++ 1 file changed, 22 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index

[PATCH v6 04/12] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

When the index is read from disk, the fsmonitor index extension is used to flag the last known potentially dirty index entries. The registered core.fsmonitor command is called with the time the index was last updated and returns the list of files changed since that time. This list is used to flag

[PATCH v6 00/12] Fast git status via a file system watcher

This is a fairly significant rewrite since V5. The big changes include: Multiple functions including preload-index(), ie_match_stat(), and refresh_cache_ent() have been updated to honor the CE_FSMONITOR_VALID bit following the same pattern as skip_worktree and CE_VALID. As a result, performance

[PATCH v6 12/12] fsmonitor: add a performance test

Add a test utility (test-drop-caches) that flushes all changes to disk then drops file system cache on Windows, Linux, and OSX. Add a perf test (p7519-fsmonitor.sh) for fsmonitor. By default, the performance test will utilize the Watchman file system monitor if it is installed. If Watchman is

[PATCH v6 11/12] fsmonitor: add a sample integration script for Watchman

This script integrates the new fsmonitor capabilities of git with the cross platform Watchman file watching service. To use the script: Download and install Watchman from https://facebook.github.io/watchman/. Rename the sample integration hook from fsmonitor-watchman.sample to fsmonitor-watchman.

[PATCH v6 08/12] fsmonitor: add a test tool to dump the index extension

Add a test utility (test-dump-fsmonitor) that will dump the fsmonitor index extension. Signed-off-by: Ben Peart --- Makefile | 1 + t/helper/test-dump-fsmonitor.c | 21 + 2 files changed, 22 insertions(+) create mode 100644

[PATCH v6 09/12] split-index: disable the fsmonitor extension when running the split index test

The split index test t1700-split-index.sh has hard coded SHA values for the index. Currently it supports index V4 and V3 but assumes there are no index extensions loaded. When manually forcing the fsmonitor extension to be turned on when running the test suite, the SHA values no longer match

[PATCH v6 10/12] fsmonitor: add test cases for fsmonitor extension

Test the ability to add/remove the fsmonitor index extension via update-index. Test that dirty files returned from the integration script are properly represented in the index extension and verify that ls-files correctly reports their state. Test that ensure status results are correct when using

[PATCH v6 05/12] fsmonitor: add documentation for the fsmonitor extension.

This includes the core.fsmonitor setting, the query-fsmonitor hook, and the fsmonitor index extension. Signed-off-by: Ben Peart --- Documentation/config.txt | 6 ++ Documentation/githooks.txt | 23 +++

[PATCH v6 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

Add a new command line option (-f) to ls-files to have it use lowercase letters for 'fsmonitor valid' files Signed-off-by: Ben Peart --- builtin/ls-files.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c

[PATCH v6 07/12] update-index: add fsmonitor support to update-index

Add support in update-index to manually add/remove the fsmonitor extension via --fsmonitor/--no-fsmonitor flags Signed-off-by: Ben Peart --- builtin/update-index.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/builtin/update-index.c

Pertenecer a la Comunidad GIT

Buen día, Me gustaría pertenecer a su comunidad y conocer mas sobre los temas de git Muchas Gracias,   Saludos Cordiales.   Administrador de la configuracion del software Eduardo Alfonso León Benítez – Lebx   Ext- 2366

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Thursday, September 14, 2017 11:00 PM > > Kevin Willford writes: > > > 1. Does this statement, "I only care about the files in this > > sparse checkout, and do not concern me with anything else", mean > > that git

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

Johannes Schindelin writes: > If you want *contributors* to ping the thread themselves, how about > *posting your updates there, too*? I do not understand this comment at all. That is what I and others already and always do by responding to the patches, and when

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

Hi, Michael Haggerty wrote: > If you pass a newly-initialized or newly-cleared `string_list` to > `for_each_string_list_item()`, then the latter does > > for ( > item = (list)->items; /* note, this is NULL */ > item < (list)->items + (list)->nr; /* note: NULL + 0 */ >

Re: [PATCH 0/3] Improve abbreviation disambiguation

Hi, Derrick Stolee wrote: > This is my first patch submission, and I look forward to your feedback. Thanks for writing this. Looks exciting. [...] > When displaying object ids, we frequently want to see an abbreviation [etc] > Note that performance improves in all cases, but the performance

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

Michael J Gruber writes: > I did not look up the discussion preceeding 4f21454b55 ("merge-base: > handle --fork-point without reflog", 2016-10-12), but if "merge-base > --fork-point" were about a "strict reflog" notion then there was nothing > to fix back then - no reflog, no

Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

Hi, Jason Merrill wrote: > Subject: Fix merge parent checking with svn.pushmergeinfo. > > Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would > get error messages like "merge parent for is on branch > svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn

[PATCH 1/3] sha1_name: Create perf test for find_unique_abbrev()

Create helper program test-abbrev to compute the minimum length of a disambiguating short-sha for 100,000 object ids. The ids are created by iterating an unsigned int hash_base by a constant hash_delta and copying hash_base five times across the sha1. Iterating by hash_delta does not create a

[PATCH 3/3] sha1_name: Parse less while finding common prefix

Create get_hex_char_from_oid() to parse oids one hex character at a time. This prevents unnecessary copying of hex characters in extend_abbrev_len() when finding the length of a common prefix. This change decreases the time to run test-abbrev by up to 40% on large repos. Signed-off-by: Derrick

RE: Is finalize_object_file in sha1_file.c handling errno from "rename" correctly?

Junio, Thanks for your response. I'm glad to see that you've been able to understand the problem. I'm working with the Windows git team to properly return EACCESS when "rename" fails due to access permissions, but it also sounds like there will need to be a fix to finalize_object_file to

Is finalize_object_file in sha1_file.c handling errno from "rename" correctly?

Using git 2.14.1 for Windows I'm seeing an issue with the follow sequence of commands: git init D:\XXX\workspace git fetch --no-tags --progress https://XXX/_git/PAPI +refs/heads/*:refs/remotes/origin/* --depth=20 git fetch --no-tags --progress https://XXX/_git/PAPI

Re: Git 2.14.1: t6500: error during test on musl libc

On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Hi there, > > While bumping Git's version for our Linux distribution to 2.14.1, I've > run in to a new test failure in t6500-gc.sh. This is the output of > the failing test with

offres de prêt

Bonjour Vous aviez besoin de prêts d'argent entre particuliers pour faire face aux difficultés financières pour enfin sortir de l'impasse que provoquent les banques, par le rejet de vos dossiers de demande de crédits ? Je suis un citoyen français en mesure de vous faire un prêt de 5000 euros à

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

On 15 Sep 2017, at 07:58, Junio C Hamano wrote: > 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

Re: Git 2.14.1: t6500: error during test on musl libc

On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote: > On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA256 > > > > Hi there, > > > > While bumping Git's version for our Linux distribution to 2.14.1, I've > > run in to a new

Re: Is finalize_object_file in sha1_file.c handling errno from "rename" correctly?

Wesley Smith writes: > 1) This bug is triggered because "git fetch" is causing a pack > file to be written when that same pack file already exists. It > seems like this is harmless and shouldn't cause a problem. Is > that correct? The final name of the packfile is

Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

On Fri, Sep 15, 2017 at 5:53 PM, Jonathan Nieder wrote: > Jason Merrill wrote: >> On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote: >> > Jason Merrill wrote: > Subject: Fix merge parent checking with svn.pushmergeinfo. Without this

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

On 09/15/2017 08:43 PM, Jonathan Nieder wrote: > Michael Haggerty wrote: > >> If you pass a newly-initialized or newly-cleared `string_list` to >> `for_each_string_list_item()`, then the latter does >> >> for ( >> item = (list)->items; /* note, this is NULL */ >> item

Re: Git 2.14.1: t6500: error during test on musl libc

On 15/09/17 06:30, Jeff King wrote: > On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote: > >> On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: >>> -BEGIN PGP SIGNED MESSAGE- >>> Hash: SHA256 >>> >>> Hi there, >>> >>> While bumping Git's version for our Linux

Are the 'How to' documents present as man pages?

I was reading the 'git revert' documentation and found the following line in it, -m parent-number --mainline parent-number ... See the revert-a-faulty-merge How-To[1] for more details. It says that the 'How-To' is present in the first section of the man page. I tried

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

Johannes Schindelin writes: > On Sat, 16 Sep 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > If you want *contributors* to ping the thread themselves, how about >> > *posting your updates there, too*? >> >> I do not

RE: [PATCH v6 04/12] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner ; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com; >

Re: [PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames.

Jason Merrill wrote: > Previously, svn dcommit of a merge with svn.pushmergeinfo set would > get error messages like "merge parent for is on branch > svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root > svn+ssh://ja...@gcc.gnu.org/svn/gcc!" > > So, let's call

RE: [PATCH v6 12/12] fsmonitor: add a performance test

> -Original Message- > + # Choose integration script based on existance of Watchman. Spelling: existence

RE: [PATCH v6 10/12] fsmonitor: add test cases for fsmonitor extension

> -Original Message- > +dirty_repo () { > + : >untracked && > + : >dir1/untracked && > + : >dir2/untracked && > + echo 1 >modified && > + echo 2 >dir1/modified && > + echo 3 >dir2/modified && > + echo 4 >new && > + echo 5 >dir1/new && > + echo 6

Re: [PATCH 1/2] test-lib: group system specific FIFO tests by system

On 15/09/17 11:31, Michael J Gruber wrote: > Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21: >> Hi Michael, >> >> On Thu, 14 Sep 2017, Michael J Gruber wrote: >> >>> test-lib determines whether a file-system supports FIFOs and needs to do >>> special casing for CYGWIN and MINGW. This

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

Hi Junio, On Sat, 16 Sep 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > If you want *contributors* to ping the thread themselves, how about > > *posting your updates there, too*? > > I do not understand this comment at all. That is what I and

RE: [PATCH v6 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

> -Original Message- > From: Ben Peart [mailto:benpe...@microsoft.com] > Sent: Friday, September 15, 2017 3:21 PM > To: benpe...@microsoft.com > Cc: David Turner ; ava...@gmail.com; > christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com; >

Re: [PATCH v5 25/40] external-odb: add 'get_direct' support

On Fri, 15 Sep 2017 13:24:50 +0200 Christian Couder wrote: > > There are still some nuances. For example, if an external ODB provides > > both a tree and a blob that the tree references, do we fetch the tree in > > order to call "have" on all its blobs, or do we trust

Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote: > Hi, > > Jason Merrill wrote: > >> Subject: Fix merge parent checking with svn.pushmergeinfo. >> >> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would >> get error messages like "merge parent for

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

On Fri, Sep 15, 2017 at 10:21 AM, Kevin Willford wrote: > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Thursday, September 14, 2017 11:00 PM >> >> Kevin Willford writes: >> >> > 1. Does this statement, "I only care about the files in this

[PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames.

Previously, svn dcommit of a merge with svn.pushmergeinfo set would get error messages like "merge parent for is on branch svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root svn+ssh://ja...@gcc.gnu.org/svn/gcc!" So, let's call remove_username (as we do for svn info) before

Re: [PATCH] Fix merge parent checking with svn.pushmergeinfo.

Jason Merrill wrote: > On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote: > > Jason Merrill wrote: >>> Subject: Fix merge parent checking with svn.pushmergeinfo. >>> >>> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would >>> get error messages like

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

Johannes Schindelin writes: > Please stop stating that you expect a reroll for rebase-i-extra when you > explicitly stated months ago that you would not take my v6. It gets a bit > annoying. I already explained to you why I skipped v6, which turned to be identical to

Re: RFC v3: Another proposed hash function transition plan

Hi Jonathan, "Jonathan Nieder" wrote; Johannes Schindelin wrote: On Wed, 13 Sep 2017, Jonathan Nieder wrote: As a side note, I am probably misreading, but I found this set of paragraphs a bit condescending. It sounds to me like you are saying "You are making the wrong

Re: What's cooking in git.git (Sep 2017, #03; Fri, 15)

Johannes Schindelin writes: > Hi Junio, > > On Fri, 15 Sep 2017, Junio C Hamano wrote: > >> -- >> [Cooking] >> >> [...] >> >> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit >> ... >> Dropped, as

Re: commit-msg hook does not run on merge with --no-ff option

Joseph Dunne writes: > Valid point. The way my project is set up I always get a conflict on > merge operations, so technically all my merges (except fast forward > merges) end with a git-commit, which of course runs the commit-msg > hook. It seems everything is working as

RFC: Design and code of partial clones (now, missing commits and trees OK)

For those interested in partial clones and/or missing objects in repos, I've updated my original partialclone patches to not require an explicit list of promises. Fetch/clone still only permits exclusion of blobs, but the infrastructure is there for a local repo to support missing trees and

Re: Commit dropped when swapping commits with rebase -i -p

Sebastian Schuberth writes: > On 2017-09-02 02:04, Jonathan Nieder wrote: > >>> Anyway, this should really more explicitly say *what* you need to know >>> about, that is, reordering commits does not work. >> >> It tries to explain that, even with an example. If you have