Re: Problem with submodules

Adding the list back on. On Sun, Oct 9, 2016 at 1:56 PM, Dennis Kaarsemaker wrote: > On Sun, 2016-10-09 at 21:15 +0200, ven...@gmail.com wrote: >> Sure, http://pastebin.com/bUFBDj0Q > > So you actually cloned from a path ending in epihany/, not epiphany. > Turns out the

Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

> On Oct 9, 2016, at 20:04, Josh Triplett wrote: > > On October 9, 2016 7:53:23 PM PDT, Jeremy Huddleston Sequoia > wrote: >> Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae >> Signed-off-by: Jeremy Huddleston Sequoia >>

[PATCH] t3700-add.sh: Avoid filename collission between tests which could lead to test failure

Regressed-in: 610d55af0f082f6b866dc858e144c03d8ed4424c Signed-off-by: Jeremy Huddleston Sequoia CC: Thomas Gummerer CC: Junio C Hamano --- t/t3700-add.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git

Re: git 2.10.1 test regression in t3700-add.sh

> On Oct 9, 2016, at 20:22, Jeremy Huddleston Sequoia > wrote: > > The issue is that the whitespace before the filename in $(git ls-files -s > "$2") is a tab, and test_mode_in_index only looks for a space. Actually, looks like that as just a rabbit hole. The real

Re: git 2.10.1 test regression in t3700-add.sh

The issue is that the whitespace before the filename in $(git ls-files -s "$2") is a tab, and test_mode_in_index only looks for a space. >< > On Oct 9, 2016, at 19:51, Jeremy Huddleston Sequoia > wrote: > > >> On Oct 9, 2016, at 17:15, Jeremy Huddleston Sequoia >>

[PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae Signed-off-by: Jeremy Huddleston Sequoia CC: Josh Triplett CC: Junio C Hamano --- t/t4014-format-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER

On October 9, 2016 7:53:23 PM PDT, Jeremy Huddleston Sequoia wrote: >Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae >Signed-off-by: Jeremy Huddleston Sequoia >CC: Josh Triplett >CC: Junio C Hamano Looks

Re: git 2.10.1 test regression in t4014-format-patch.sh

> On Oct 9, 2016, at 17:18, Josh Triplett wrote: > > On October 9, 2016 5:15:22 PM PDT, Jeremy Huddleston Sequoia > wrote: >> Hey Josh, >> >> Hope you're doing well. >> >> I wanted to let you know that this patch of yours, which landed in git

Re: git 2.10.1 test regression in t3700-add.sh

> On Oct 9, 2016, at 17:15, Jeremy Huddleston Sequoia > wrote: > > Hi Thomas, > > I wanted to let you know that this patch of yours, which landed in git > 2.10.1, introduced some test failures, seen on macOS. > > Let me know if you need any additional information

git 2.10.1 test regression in t3700-add.sh

Hi Thomas, I wanted to let you know that this patch of yours, which landed in git 2.10.1, introduced some test failures, seen on macOS. Let me know if you need any additional information to track these down. Thanks, Jeremy not ok 40 - git add --chmod=[+-]x changes index with already added

git 2.10.1 test regression in t4014-format-patch.sh

Hey Josh, Hope you're doing well. I wanted to let you know that this patch of yours, which landed in git 2.10.1, introduced some test failures, seen on macOS. Let me know if you need any additional information to track these down. Thanks, Jeremy not ok 65 - format-patch default signature #

Re: git 2.10.1 test regression in t4014-format-patch.sh

On October 9, 2016 5:15:22 PM PDT, Jeremy Huddleston Sequoia wrote: >Hey Josh, > >Hope you're doing well. > >I wanted to let you know that this patch of yours, which landed in git >2.10.1, introduced some test failures, seen on macOS. > >Let me know if you need any

Re: [PATCH] use strbuf_add_unique_abbrev() for adding short hashes, part 3

On Sat, Oct 08, 2016 at 05:38:47PM +0200, René Scharfe wrote: > Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs > instead of taking detours through find_unique_abbrev() and its static > buffer. This is shorter in most cases and a bit more efficient. > > The changes here are

Re: %C(auto) not working as expected

On Sun, Oct 09, 2016 at 03:24:17PM +0200, René Scharfe wrote: > Offering a way to enable terminal-detection for all color codes of a > format would be useful, but using the existing "auto," prefix for that > would be a behaviour change that could surprise users. Yeah. In retrospect, it probably

RE: How to watch a mailing list & repo for patches which affect a certain area of code?

> -Original Message- > From: Ian Kelling > Sent: Sunday, October 09, 2016 15:03 > > I've got patches in various projects, and I don't have time to keep up > with the mailing list, but I'd like to help out with > maintenance of that > code, or the functions/files it touches. People don't

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Sun, Oct 09, 2016 at 06:32:38PM +0700, Duy Nguyen wrote: > > If you mean ambiguity between the old "alias.X" and the new "alias.X.*", > > then yes, I think that's an unavoidable part of the transition. IMHO, > > the new should take precedence over the old, and people will gradually > > move

Re: Problem with submodules

hm okay, it works with 2.10.0, when I remove the word 'epiphany' from the urls in line 13 and 15 2016-10-09 21:15 GMT+02:00 ven...@gmail.com : > Sure, http://pastebin.com/bUFBDj0Q

Re: Problem with submodules

Sure, http://pastebin.com/bUFBDj0Q

How to watch a mailing list & repo for patches which affect a certain area of code?

I've got patches in various projects, and I don't have time to keep up with the mailing list, but I'd like to help out with maintenance of that code, or the functions/files it touches. People don't cc me. I figure I could filter the list, test patches submitted, commits made, mentions of

Re: Problem with submodules

On Sun, 2016-10-09 at 16:41 +0200, ven...@gmail.com wrote: > Hi, I want to report a regression. > > After cloning for example https://git.gnome.org/browse/epiphany with > git 2.10 and running ./autogen.sh I get the following errors: > http://pastebin.com/93AunRhu > > The developer told me that

Problem with submodules

Hi, I want to report a regression. After cloning for example https://git.gnome.org/browse/epiphany with git 2.10 and running ./autogen.sh I get the following errors: http://pastebin.com/93AunRhu The developer told me that it is probably not an issue caused by epiphany and I should try an older

Re: Bug? git worktree fails with master on bare repo

Dennis, Thanks for the great response, and for spending time on my issue. I'll try that first patch and see what happens. In the meantime, it got weirder... I created a brand-new (bare) repo and was able to git add worktree /path master. I was able to do this repeatedly, even using the worktree

Re: %C(auto) not working as expected

Am 09.10.2016 um 12:04 schrieb Tom Hale: > On 2016-10-09 13:47, René Scharfe wrote: > >> %Cgreen emits color codes unconditionally. %C(auto,green) would respect >> the config settings. > > Thanks, I've never seen the (,) syntax documented before! Both the prefix "auto," for terminal-detection

RE: A head scratcher, clone results in modified files (tested linux and cygwin) - .gitattributes file?

> -Original Message- > From: Torsten Bögershausen > Sent: Sunday, October 09, 2016 06:27 > > On 09/10/16 08:48, Jason Pyeron wrote: > > > The whole .gitattributes needs to be adopted, I think > > Git 2.10 or higher has "git ls-files --eol": > > git ls-files --eol | grep

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Sun, Oct 9, 2016 at 1:01 PM, Jeff King wrote: > On Sat, Oct 08, 2016 at 10:36:13AM +0200, Johannes Schindelin wrote: > >> > > Maybe it's time to aim for >> > > >> > > git config alias.d2u.shell \ >> > >'f() { git ls-files "$@" | xargs dos2unix; }; f' >> > > git

[PATCH] contrib: add credential helper for libsecret

This is based on the existing gnome-keyring helper, but instead of libgnome-keyring (which was specific to GNOME and is deprecated), it uses libsecret which can support other implementations of XDG Secret Service API. Passes t0303-credential-external.sh. Signed-off-by: Mantas Mikulėnas

Re: Feature request: use relative path in worktree config files

2016-10-09 13:37 GMT+02:00 Duy Nguyen : > On Sun, Oct 9, 2016 at 6:22 PM, Stéphane Klein > wrote: >> 2016-10-09 13:11 GMT+02:00 Duy Nguyen : Why: 1. I configure worktree on my host 2. next I use this git

Re: Feature request: use relative path in worktree config files

On Sun, Oct 9, 2016 at 6:22 PM, Stéphane Klein wrote: > 2016-10-09 13:11 GMT+02:00 Duy Nguyen : > >>> * [worktree_foobar]/.git >> This is made absolute on purpose. So that if you move worktree_foobar >> away manually, it can still point back to >>

Re: Feature request: use relative path in worktree config files

2016-10-09 13:11 GMT+02:00 Duy Nguyen : >> * [worktree_foobar]/.git > This is made absolute on purpose. So that if you move worktree_foobar > away manually, it can still point back to > "[main_worktree]/.git/worktrees/[woktree_foobar]". Same problem if you move origin git

Re: [PATCH v2 3/3] gitweb: Link to "git describe"'d commits in log messages

On Thu, Oct 6, 2016 at 9:51 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Change the log formatting function to know about "git describe" output >> such as "v2.8.0-4-g867ad08", in addition to just plain "867ad08". >> >> There are still

Re: Feature request: use relative path in worktree config files

On Sat, Oct 8, 2016 at 4:35 PM, Stéphane Klein wrote: > Hi, > > "git worktree add" write absolute path in ".git/gitdir" > > The code source is here > https://git.kernel.org/cgit/git/git.git/tree/builtin/worktree.c?h=v2.10.1#n256 > > Is it possible to use relative path

Re: Bug? git worktree fails with master on bare repo

On Sun, Oct 9, 2016 at 2:51 PM, Dennis Kaarsemaker wrote: > On Sat, 2016-10-08 at 19:30 -0500, Michael Tutty wrote: >> Hey all, >> I'm working on some server-side software to do a merge. By using git >> worktree it's possible to check out a given branch for a bare repo and

Re: [PATCH v2 20/25] sequencer: left-trim lines read from the script

Am 09.10.2016 um 10:57 schrieb Johannes Schindelin: Good point. I decided to do it at a different level, though: parse_insn_line() should already receive the line without trailing end-of-line markers (this was already the case for LF-only todo scripts). I reused your commit message and touched

Re: A head scratcher, clone results in modified files (tested linux and cygwin) - .gitattributes file?

On 09/10/16 08:48, Jason Pyeron wrote: The whole .gitattributes needs to be adopted, I think Git 2.10 or higher has "git ls-files --eol": git ls-files --eol | grep "i/crlf.*auto" i/crlf w/crlf attr/text=auto src/site/xdoc/upgradeto2_3.xml i/crlf w/crlf attr/text=auto

Re: %C(auto) not working as expected

On 2016-10-09 13:47, René Scharfe wrote: %Cgreen emits color codes unconditionally. %C(auto,green) would respect the config settings. Thanks, I've never seen the (,) syntax documented before! What's strange is that this works: %C(auto,green bold) but %C(auto,green,bold) does not. Also:

[PATCH v1 1/2] read-cache: factor out get_sha1_from_index() helper

From: Torsten Bögershausen Factor out the retrieval of the sha1 for a given path in read_blob_data_from_index() into the function get_sha1_from_index(). This will be used in the next commit, when convert.c can do the analyze for "text=auto" without slurping the whole blob into

[PATCH v1 0/2] convert: stream and early out

From: Torsten Bögershausen An optimization when autocrlf is used and the binary/text detection is run. Or git ls-files --eol is run to analyze the content of files or blobs. Torsten Bögershausen (2): read-cache: factor out get_sha1_from_index() helper convert.c: stream and

[PATCH v1 2/2] convert.c: stream and early out

From: Torsten Bögershausen When statistics are done for the autocrlf handling, the search in the content can be stopped, if e.g - a search for binary is done, and a NUL character is found - a search for CRLF is done, and the first CRLF is found. Similar when statistics for binary

Re: [PATCH v2 20/25] sequencer: left-trim lines read from the script

Hi Hannes, On Thu, 6 Oct 2016, Johannes Sixt wrote: > [PATCH] sequencer: strip CR from the end of exec insns > > It is not unheard of that editors on Windows write CRLF even if the file > originally had only LF. This is particularly awkward for exec lines of a > rebase -i todo sheet. Take for

Re: Bug? git worktree fails with master on bare repo

On Sat, 2016-10-08 at 19:30 -0500, Michael Tutty wrote: > Hey all, > I'm working on some server-side software to do a merge. By using git > worktree it's possible to check out a given branch for a bare repo and > merge another branch into it. It's very fast, even with large > repositories. > >

Re: Bug? git worktree fails with master on bare repo

On Sat, Oct 08, 2016 at 07:30:36PM -0500, Michael Tutty wrote: > Hey all, > I'm working on some server-side software to do a merge. By using git > worktree it's possible to check out a given branch for a bare repo and > merge another branch into it. It's very fast, even with large > repositories.

Re: %C(auto) not working as expected

Am 09.10.2016 um 07:43 schrieb Tom Hale: $ ~/repo/git/git --version git version 2.10.0.GIT The `git-log` man page says: `auto` alone (i.e. %C(auto)) will turn on auto coloring on the next placeholders until the color is switched again. In this example: http://i.imgur.com/y3yLxk7.png I turn

A head scratcher, clone results in modified files (tested linux and cygwin) - .gitattributes file?

Does anyone have any ideas as to why this clone resulted in modified files and how to prevent it? There is a .gitattributes in the tree, which says: *text=auto *.java text diff=java *.html text diff=html *.csstext *.js text *.sqltext But even then the *.bin files full

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Sat, Oct 08, 2016 at 10:36:13AM +0200, Johannes Schindelin wrote: > > > Maybe it's time to aim for > > > > > > git config alias.d2u.shell \ > > >'f() { git ls-files "$@" | xargs dos2unix; }; f' > > > git config alias.d2u.cdup false > > > git d2u *.c # yada! > > > > That would

Re: [PATCH/RFC] git.c: support "!!" aliases that do not move cwd

On Sun, Oct 09, 2016 at 02:01:49AM -0400, Jeff King wrote: > > So what about this? > > > > [alias] > > d2u = !dos2unix > > [alias "d2u"] > > shell = 'f() { git ls-files "$@" | xargs dos2unix; }; f' > > exec = C:/cygwin64/bin/dos2unix.exe > > > > You