Re: [PATCH v6 3/3] rev-list: support --no-filter argument

On Tue, Dec 5, 2017 at 5:50 PM, Jeff Hostetler wrote: > From: Jeff Hostetler > > Teach rev-list to support --no-filter to override a > previous --filter= argument. This is > to be consistent with commands that use OPT_PARSE > macros. > >

Re: [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg()

On Sun, Dec 10, 2017 at 3:39 PM, Jeff King wrote: > On Sun, Dec 10, 2017 at 09:31:18AM -0500, Jeff King wrote: > >> On Sat, Dec 09, 2017 at 09:40:07PM +0100, Christian Couder wrote: >> >> > The changes compared to v2 are: >> > >> > - s/_val/_arg/ in the name of the functions >> >

[PATCH] git-gui: Make push remote combobox full width

When pushing changes, the Remote combobox for the Destination Repository does not take all available space in the layout. With long remote names, this causes the combobox to have truncated entries even though there is room to display them. Anchor the remote_m combobox to both left and right edges

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge,noworking tree file changes)

On Dec 11, 2017, at 01:17, Igor Djordjevic wrote: > On 10/12/2017 13:22, Phillip Wood wrote: >> I understood Alexei to mean that it was merging the f!A into A that >> caused conflicts due to the fact that f!A has conflicting context >> that was introduced in B. After all B' the rebased B is merge

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge,noworking tree file changes)

On Dec 10, 2017, at 14:22, Phillip Wood wrote: > > I've found conflicts arising from moving fixups can be quite common, so > these days I tend to edit the commit to be fixed up directly. I have a > script git-amend that does something like > > target=$(git rev-parse --verify "$1") &&

Bug: "git status --porcelain --show-stash" does not show stash count

Using: $ git version git version 2.15.1 Running without --porcelain shows the correct stash count: $ git status --show-stash On branch feature-Enable-Unmarshaling-Support Untracked files: (use "git add ..." to include in what will be committed) testdata/

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

On Sun, Dec 10, 2017 at 4:22 PM, Thomas Gummerer wrote: > Make sure that split index doesn't get broken, by running it on travis > CI. > > Run the test suite with split index enabled in linux 64 bit mode, and > leave split index turned off in 32-bit mode. The laternative

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge,noworking tree file changes)

Hi Philip, On 10/12/2017 13:22, Phillip Wood wrote: > > Sorry I should have been clearer. The point I was somewhat obliquely > making was that 'rebase --onto' succeeds where 'rebase --autosquash' > fails not because it is smarter but because it is doing something > different. Specifically it

Re: [PATCH Outreachy 1/2] format: create pretty.h file

Jeff King writes: > On Fri, Dec 08, 2017 at 09:40:09AM -0800, Junio C Hamano wrote: > >> I see you've "standardized" to drop "extern" from the declarations >> in the header; I have an impression that our preference however is >> to go in the other direction. > > Can we revisit

Re: t9001 failures on 32-bit Linux?

Ramsay Jones writes: > Hi Junio, > > I noticed the revert of the 'ab/simplify-perl-makefile' branch on > top of 'pu'. So, I fired up my 32-bit Linux and attempted to see > if I could debug this t9001 test failure. > > Unfortunately, I could not get it to fail. :( > >

RE: SSH port ignored when ssh:// prefix isn't specified

On December 10, 2017 3:24 PM Mahmoud wrote: >It appears that for non-standard ports to be specified for ssh-based clones/checkouts, the leading "ssh://" prefix must >be applied. I am unsure if there's a reason for this or if it is simply an overlooked idiosyncrasy in the parser. >Basically,

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

be489d02d2 ("revision.c: --indexed-objects add objects from all worktrees", 2017-08-23) made sure that pruning takes objects from all worktrees into account. It did that by reading the index of every worktree and adding the necessary index objects to the set of pending objects. The index is read

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

Make sure that split index doesn't get broken, by running it on travis CI. Run the test suite with split index enabled in linux 64 bit mode, and leave split index turned off in 32-bit mode. The laternative would be to add an extra target in the matrix, enabling split index mode, but that would

[PATCH 0/3] fixes for split index mode

On the current master branch, 95ec6b1b33 ("RelNotes: the eighth batch", 2017-12-06) , the test suite fails a few tests when GIT_TEST_SPLIT_INDEX is set: Test Summary Report --- t3007-ls-files-recurse-submodules.sh (Wstat: 256 Tests: 21 Failed: 13) Failed tests:

[PATCH 1/3] repository: fix repo_read_index with submodules

repo_read_index calls read_index_from, which takes an path argument for the location of the index file. For the split index however it relies on the current working directory to construct the path using git_path. repo_read_index calls read_index_from with the full path for the index file,

Re: t9001 failures on 32-bit Linux?

On Sun, Dec 10 2017, Ramsay Jones jotted: > On 10/12/17 20:33, Ævar Arnfjörð Bjarmason wrote: >> On Sun, Dec 10, 2017 at 8:58 PM, Ramsay Jones >> wrote: >>> I noticed the revert of the 'ab/simplify-perl-makefile' branch on >>> top of 'pu'. So, I fired up my 32-bit

[PATCH v3] Makefile: replace perl/Makefile.PL with simple make rules

Replace the perl/Makefile.PL and the fallback perl/Makefile used under NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily inspired by how the i18n infrastructure's build process works[1]. The reason for having the Makefile.PL in the first place is that it was initially[2]

Re: t9001 failures on 32-bit Linux?

On 10/12/17 20:33, Ævar Arnfjörð Bjarmason wrote: > On Sun, Dec 10, 2017 at 8:58 PM, Ramsay Jones > wrote: >> I noticed the revert of the 'ab/simplify-perl-makefile' branch on >> top of 'pu'. So, I fired up my 32-bit Linux and attempted to see >> if I could debug

Re: t9001 failures on 32-bit Linux?

On Sun, Dec 10, 2017 at 8:58 PM, Ramsay Jones wrote: > I noticed the revert of the 'ab/simplify-perl-makefile' branch on > top of 'pu'. So, I fired up my 32-bit Linux and attempted to see > if I could debug this t9001 test failure. > > Unfortunately, I could not get

Re: SSH port ignored when ssh:// prefix isn't specified

"mqu...@neosmart.net" writes: > Basically, while `git clone ssh://g...@example.com:/path` works, the same > with the `ssh://` prefix doesn't, and attempts to establish a connection to > port 22 instead: `git clone g...@example.com:/path` (I'm not sure what it > will

SSH port ignored when ssh:// prefix isn't specified

Greetings, It appears that for non-standard ports to be specified for ssh-based clones/checkouts, the leading "ssh://" prefix must be applied. I am unsure if there's a reason for this or if it is simply an overlooked idiosyncrasy in the parser. Basically, while `git clone

t9001 failures on 32-bit Linux?

Hi Junio, I noticed the revert of the 'ab/simplify-perl-makefile' branch on top of 'pu'. So, I fired up my 32-bit Linux and attempted to see if I could debug this t9001 test failure. Unfortunately, I could not get it to fail. :( Both of the 'pu' (@77e921d77d) and 'pu~1' (@cfef1ebefd) builds

Please reply, I have a genuine business to discuss with you.

I have a business proposal for you, it is an oil exportation proposition contract for you and this is a highly prospective crude oil sales venture; it involves the exportation 300,000 barrels of Light Crude Oil daily, this project is genuine, legal and highly lucrative. For more details, please

Re: [PATCH Outreachy 1/2] format: create pretty.h file

On Fri, Dec 08, 2017 at 09:40:09AM -0800, Junio C Hamano wrote: > I see you've "standardized" to drop "extern" from the declarations > in the header; I have an impression that our preference however is > to go in the other direction. Can we revisit that? I haven't see any compelling reason to

Re: [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg()

On Sun, Dec 10, 2017 at 09:31:18AM -0500, Jeff King wrote: > On Sat, Dec 09, 2017 at 09:40:07PM +0100, Christian Couder wrote: > > > The changes compared to v2 are: > > > > - s/_val/_arg/ in the name of the functions > > - s/val/arg/ in the name of the third argument of the functions > >

Re: [PATCH v3 1/7] git-compat-util: introduce skip_to_optional_arg()

On Sat, Dec 09, 2017 at 09:40:07PM +0100, Christian Couder wrote: > The changes compared to v2 are: > > - s/_val/_arg/ in the name of the functions > - s/val/arg/ in the name of the third argument of the functions > - works with NULL as third argument of the functions This whole series

Re: [PATCH v2 4/4] t/Makefile: introduce TEST_SHELL_PATH

On Sat, Dec 09, 2017 at 02:44:44PM +0100, Johannes Schindelin wrote: > > > ... and we could simply see whether the environment variable > > > TEST_SHELL_PATH (which we would set in t/Makefile from the passed-in > > > SHELL_PATH) is set, and override it again. > > > > > > I still think we can do

Re: [PATCH v1 1/1] check-non-portable-shell.pl: Quoted `wc -l` is not portable

Hi Torsten, On Sun, 10 Dec 2017, tbo...@web.de wrote: > From: Torsten Bögershausen > > wc -l is used to count the number if lines in test scripts. > $ wc -l Makefile > gives a line like this: > 105 Makefile > while Mac OS has 4 leading spaces: > 105 Makefile > > And this

Re: What's cooking in git.git (Dec 2017, #01; Mon, 4)

Hi Torsten, On Sat, 9 Dec 2017, Torsten Bögershausen wrote: > On Thu, Dec 07, 2017 at 04:33:12PM -0500, Todd Zullinger wrote: > > Jeff Hostetler wrote: > > >I'm looking at t5616 now on my mac. > > >Looks like the MAC doesn't like my line counting in the tests. > > >I'll fix in my next version. >

Hello My Dear Friend,

I have a business proposal in the tune of $10.2 Million USD for you to handle with me. I have opportunity to transfer this abandon fund to your bank account in your country which belongs to our client. I am inviting you in this transaction where this money can be shared between us at ratio

Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge,noworking tree file changes)

On 10/12/17 01:20, Igor Djordjevic wrote: > > Hi Philip, > > On 09/12/2017 20:01, Phillip Wood wrote: >> >>> But thanks for clarifying, anyway, it does feel like `git rebase >>> -i --autosquash` could be smarter in this regards, if `git rebase >>> --onto` does it better...? >> >> Creating the

RE: [PATCH] doc: reword gitworflows for neutrality

>As a native English speaker, I find the new phrasing odd, and think >this may a step backward. How about trying a different approach? For >example: >Occasionally, the maintainer may get merge conflicts when trying >to pull changes from downstream. In this case, it may make sense >to

[PATCH v1 1/1] check-non-portable-shell.pl: Quoted `wc -l` is not portable

From: Torsten Bögershausen wc -l is used to count the number if lines in test scripts. $ wc -l Makefile gives a line like this: 105 Makefile while Mac OS has 4 leading spaces: 105 Makefile And this means that shell expressions like test "$(wc -l