Re: [git-for-windows] Git for Windows v2.24.0-rc0, was Re: [ANNOUNCE] Git v2.24.0-rc0

2019-10-22 Thread Philip Oakley
Hi Dscho, Install went Ok. Did a quick test on the config locations and `git config -l -show-origin` has 'lost' the ProgramData location as planned. The minor pedant did notice that the new location is listed slightly differently from the release notes. `file:C:/Program Files/Git/mingw64/..

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-20 Thread Philip Oakley
On 20/10/2019 00:23, Jeff King wrote: On Sat, Oct 19, 2019 at 09:20:11PM +0200, Christian Couder wrote: +static void write_reused_pack_one(size_t pos, struct hashfile *out, + struct pack_window **w_curs) +{ + off_t offset, next, cur; + enum object_type type

[PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Philip Oakley
Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of . Detail the options for cloning a complete repo. Signed-off-by: Philip

Re: [PATCH v4] Doc: Bundle file usage

2019-10-20 Thread Philip Oakley
On 20/10/2019 02:10, Jeff King wrote: On Fri, Oct 18, 2019 at 09:30:52PM +0100, Philip Oakley wrote: +`git clone` can use any bundle created without negative refspecs +(e.g., `new`, but not `old..new`). +If you want to match `git clone --mirror`, which would clone other +refs such as `refs

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Philip Oakley
Hi Christian, On 19/10/2019 19:55, Christian Couder wrote: Hi Philip, On Sat, Oct 19, 2019 at 5:25 PM Philip Oakley wrote: Hi Christian, can I check one thing? Yeah, sure! Thanks for taking a look at my patches! On 19/10/2019 11:35, Christian Couder wrote: +int bitmap_walk_contains

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-19 Thread Philip Oakley
Hi Christian, a couple of mem_size questions? On 19/10/2019 11:35, Christian Couder wrote: From: Jeff King Let's store the chunks of the packfile that we reuse in a dynamic array of `struct reused_chunk`, and let's use a reuse_packfile_bitmap to speed up reusing parts of packfiles. The dynam

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Philip Oakley
Hi Christian, can I check one thing? On 19/10/2019 11:35, Christian Couder wrote: From: Jeff King We will use this helper function in a following commit to tell us if an object is packed. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- pack-bitmap.c | 12 pack-b

Re: [PATCH v1] config/branch: state that .merge is the remote ref

2019-10-19 Thread Philip Oakley
Hi Junio, On 19/10/2019 00:11, Junio C Hamano wrote: Philip Oakley writes: branch..merge::     Defines, for the local branch , the upstream branch ref     _on the remote_ (as given by branch..remote).     The upstream ref may be different from the local branch ref. optionally s/different

Re: Git Gui: Branch->create currently fails...

2019-10-18 Thread Philip Oakley
Hi Pratyush On 16/10/2019 19:52, Pratyush Yadav wrote: On 14/10/19 11:11PM, Philip Oakley wrote: On 14/10/2019 18:57, Pratyush Yadav wrote: list "refs/heads/MSVC-README" [list "commit" "056fb95c8e983ec07e9f5f8baa0b119bf3d13fed" [concat "" "Philip O

[PATCH v2] config/branch: state that .merge is the remote ref

2019-10-18 Thread Philip Oakley
The branch..merge value typically looks just like a local ref. Tell the reader it is the ref name at the remote, which may be different. Signed-off-by: Philip Oakley --- Documentation/config/branch.txt | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation

Re: [PATCH v1] config/branch: state that .merge is the remote ref

2019-10-18 Thread Philip Oakley
Hi Junio, On 18/10/2019 02:32, Junio C Hamano wrote: Philip Oakley writes: branch..merge:: Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which + for the given

[PATCH v4] Doc: Bundle file usage

2019-10-18 Thread Philip Oakley
Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of . Detail the options for cloning a complete repo. Signed-off-by: Philip

Re: [PATCH v3] Doc: Bundle file usage

2019-10-18 Thread Philip Oakley
On 18/10/2019 19:15, Pratyush Yadav wrote: On 18/10/19 04:15PM, Philip Oakley wrote: From: Philip Oakley Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage

[PATCH v3] Doc: Bundle file usage

2019-10-18 Thread Philip Oakley
From: Philip Oakley Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of . Detail the options for cloning a complete repo

[PATCH v2] t/README: the test repo does not have global or system configs

2019-10-18 Thread Philip Oakley
Also, fix minor wording mistake in referenced config section. Signed-off-by: Philip Oakley --- The basic --local config also doesn't appear to be well defined here. test-lib.sh sets GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt If no config template then..? e

Re: Raise your hand to Ack jk/code-of-conduct if your Ack fell thru cracks

2019-10-17 Thread Philip Oakley
Hi all, On 11/10/2019 06:58, Jeff King wrote: I snipped your concerns with some of the language. I do agree with you that a lot of is open to interpretation. But I also think it's impossible to get it 100% airtight. My feeling was that it was a good idea to go with some existing, well-establishe

Re: [RFC PATCH v1] t/README: the test repo does not have global or system configs

2019-10-16 Thread Philip Oakley
On 16/10/2019 17:47, SZEDER Gábor wrote: On Wed, Oct 16, 2019 at 01:45:15PM +0100, Philip Oakley wrote: Signed-off-by: Philip Oakley --- While tring to get to grips with some Git-for-Windows config settings for testing >4GiB files, I couldn't find any note in the readme about the tes

[RFC PATCH v1] t/README: the test repo does not have global or system configs

2019-10-16 Thread Philip Oakley
Signed-off-by: Philip Oakley --- While tring to get to grips with some Git-for-Windows config settings for testing >4GiB files, I couldn't find any note in the readme about the test system config file sources. Is this the right place for the information, is it complete enough, an

[PATCH v1] config/branch: state that .merge is the remote ref

2019-10-16 Thread Philip Oakley
The branch..merge value typically looks just like a local ref. Tell the reader it is the ref name at the remote, which may be different. Signed-off-by: Philip Oakley --- This confusion had me scratching my head for many minutes recently. A simple clarification would avoid such mental model

Re: [PATCH v2] Doc: Bundle file usage

2019-10-16 Thread Philip Oakley
On 16/10/2019 10:57, Philip Oakley wrote: From: Philip Oakley Oops - the From: line still has my old email address. Is a resend preferred, or can it be fixed locally? P. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle

[PATCH v2] Doc: Bundle file usage

2019-10-16 Thread Philip Oakley
From: Philip Oakley Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of . Detail the options for cloning a complete repo. Signed-off-by: Philip Oakley --- This takes up the advice from

Re: Git Gui: Branch->create currently fails...

2019-10-14 Thread Philip Oakley
On 14/10/2019 18:57, Pratyush Yadav wrote: list "refs/heads/MSVC-README" [list "commit" "056fb95c8e983ec07e9f5f8baa0b119bf3d13fed" [concat "" "Philip Oakley"] [reformat_date [concat "" "Sun May 19 22:33:37 2019 +0100"]] &qu

Re: Git Gui: Branch->create currently fails...

2019-10-14 Thread Philip Oakley
er lines). There is an empty line 4901 (CRLF) Yeah, that's a lot of refs! On my git.git clone, I get 1299 lines, and I have git.git, my fork of git.git, and gitster in my remotes. the last two lines are: list "refs/heads/branch-patterns" [list "commit" "b245

Re: Git Gui: Branch->create currently fails...

2019-10-12 Thread Philip Oakley
Hi Pratyus, On 08/10/2019 01:00, Pratyush Yadav wrote: On 07/10/19 11:02PM, Philip Oakley wrote: I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I'm afraid I can't repro

Re: [PATCH] git-rev-list.txt: prune options in synopsis

2019-10-11 Thread Philip Oakley
On 11/10/2019 07:04, Jeff King wrote: On Fri, Oct 04, 2019 at 05:13:08PM -0700, Denton Liu wrote: The synopsis section in git-rev-list.txt has grown to be a huge list that probably needs its own synopsis. Since the list is huge, users may be given the false impression that the list is complete,

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-10 Thread Philip Oakley
Hi Dscho, On 10/10/2019 10:03, Johannes Schindelin wrote: So a better interpretation would have been: The default creation factor is 60 (roughly speaking, it wants at most 60% of the diffs' lines to differ, otherwise it considers them not to be a match. This is still inaccurate, but at le

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-09 Thread Philip Oakley
Hi Dscho, On 08/10/2019 13:46, Johannes Schindelin wrote: Hi Junio, On Tue, 8 Oct 2019, Junio C Hamano wrote: Johannes Schindelin writes: I didn't quite understand this part, though. The default creation factor is 60 (roughly speaking, it wants 60% of the lines to match between

Re: Git Gui: Branch->create currently fails...

2019-10-07 Thread Philip Oakley
On 07/10/2019 23:02, Philip Oakley wrote: I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I don't forget ... (I'm chasing down other issue at the moment ;-) Forgot to

Git Gui: Branch->create currently fails...

2019-10-07 Thread Philip Oakley
I'd never used the Branch:Create before (this is via mouse) and it threw an error, which appears to be repeatable, so I'm reporting it at the moment so I don't forget ... (I'm chasing down other issue at the moment ;-) This is with the version 0.21.GI git version 2.23.0.windows.1 Tcl/Tck 8.6.9

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-06 Thread Philip Oakley
Hi Dscho, On 06/10/2019 21:27, Johannes Schindelin wrote: Let me provide you with some data, then. Granted, it's not necessarily all Git GUI, but it includes Git GUI patches, too: Git for Windows' contributions. As should be well-known, I try to follow Postel's Law when it comes to Git for Wind

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

2019-10-06 Thread Philip Oakley
On 06/10/2019 19:39, Pratyush Yadav wrote: That way, you don't have to introduce settings separate from `git-cola`'s, and you can reuse the short-and-sweet variable name. I think a more important question is whether we_really_ need to have compatibility with git-cola. Most of our shortcuts don'

Re: unsibscribe git

2019-10-05 Thread Philip Oakley
On 05/10/2019 17:14, Alexander Litvinov wrote: unsibscribe git try sending to majordomo, see http://vger.kernel.org/vger-lists.html#git

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-04 Thread Philip Oakley
On 04/10/2019 16:22, Bert Wesarg wrote: On Thu, Oct 3, 2019 at 11:40 PM Philip Oakley wrote: On 03/10/2019 21:54, Pratyush Yadav wrote: My only remaining bikeshed question it prompted was to check which parts would be committed as part of committing the whole "hunk". But haven

Re: Git Basics Episode 1 GUI

2019-10-04 Thread Philip Oakley
uot;GitHub for Mac graphical client". Philip Best regards On 4 Oct 2019, at 11:14, Philip Oakley <mailto:philipoakley@iee.email>> wrote: On 04/10/2019 08:19, Colin Agnew wrote: Could you confirm which GUI is featured in the first video? Please advise - thanks Dunno, Do you

Re: Git Basics Episode 1 GUI

2019-10-04 Thread Philip Oakley
On 04/10/2019 08:19, Colin Agnew wrote: Could you confirm which GUI is featured in the first video? Please advise - thanks Dunno, Do you have a web reference for the "Git Basics Episode 1" and then which video you are watching? I guess that if it is the plain vanila Git, then it will be `git

Re: [Outreachy] Outreachy internship program

2019-10-03 Thread Philip Oakley
On 03/10/2019 21:35, Emily Shaffer wrote: Hi George, it sounds like you are probably using Git for Windows (https://github.com/git-for-windows/git). I'm actually not very familiar with how folks who primarily use GfW as their client manage their contributions to the main Git project. However, I

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-03 Thread Philip Oakley
On 03/10/2019 21:54, Pratyush Yadav wrote: My only remaining bikeshed question it prompted was to check which parts would be committed as part of committing the whole "hunk". But haven't had time to look at all! I'm not sure what you mean by "committing the whole hunk". In a merge conflict state

Re: subscribing to list.

2019-10-03 Thread Philip Oakley
On 03/10/2019 19:02, Rohit Sanjay wrote: subscribe me try http://vger.kernel.org/vger-lists.html#git for more info... (email to majord...@vger.kernel.org  body = `subscribe git`) -- Philip PS. the list uses bottom posting https://en.wikipedia.org/wiki/Posting_style

Re: [PATCH 2/2] git-gui: support for diff3 conflict style

2019-10-03 Thread Philip Oakley
On 30/09/2019 13:17, Bert Wesarg wrote: Pratyush, On Sun, Sep 29, 2019 at 5:04 PM Pratyush Yadav wrote: Hi Philip, Bert, Is there any way I can test this change? Philip, I ran the rebase you mention in the GitHub issue [0], and I get that '9c8cba6862abe5ac821' is an unknown revision. Is ther

Re: [PATCH v2] doc: MyFirstContribution: fix cmd placement instructions

2019-09-26 Thread Philip Oakley
On 26/09/2019 20:05, Pedro Sousa wrote: Using the pull command instead of push is more accurate when giving instructions on placing the psuh command in alphabetical order. Signed-off-by: Pedro Sousa --- Changes since v1: Addressed Philip's comments on making alphabetical sort instructions more

Re: sizeof(var) vs sizeof(type), was Re: [PATCH] git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()

2019-09-26 Thread Philip Oakley
On 26/09/2019 14:36, Derrick Stolee wrote: Another good reason to use "sizeof(var)" instead of sizeof(type)". :) That is indeed a very good reason, in addition to getting the type right automatically (by virtue of letting the compiler pick it). Should we make this an explicit guideline in our d

Re: Bi-Weekly Standup - Time/timezone in calendar?

2019-09-25 Thread Philip Oakley
On 25/09/2019 15:32, Thomas Gummerer wrote: On 09/25, Philip Oakley wrote: Hi, At the Virtual Git Contributors Summit we discussed (#13) the bi-weekly standup meetings (mentioned in the Git Rev News edition 55 under 'News/Various'). The Git Events calendar [1] that's linked fr

Re: [DISCUSSION] Growing the Git community

2019-09-25 Thread Philip Oakley
Hi Pierre, On 25/09/2019 14:36, Pierre Tardy wrote: As a community, our number one goal is for Git to continue to be the best distributed version control system. At minimum, it should continue to be the most widely-used DVCS. I'd rather we stated our goal in terms of what problems we are trying

Bi-Weekly Standup - Time/timezone in calendar?

2019-09-25 Thread Philip Oakley
Hi, At the Virtual Git Contributors Summit we discussed (#13) the bi-weekly standup meetings (mentioned in the Git Rev News edition 55 under 'News/Various'). The Git Events calendar [1] that's linked from the Rev News doesn't actually say what time zone to use for the stand-up start time, so

Re: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

2019-09-25 Thread Philip Oakley
prepare my rerere cache [how to do /that/ ?] and the rebase) On Wed, Sep 25, 2019 at 12:05 AM Philip Oakley wrote: Hi list, cc Pratyush, [resend without attached png file] While rebasing an old series, I had a 3-way merge fall back that didn't show the `||| merged common ancestor

Fwd: git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

2019-09-24 Thread Philip Oakley
Hi list, cc Pratyush, [resend without attached png file] While rebasing an old series, I had a 3-way merge fall back that didn't show the `||| merged common ancestors` very well in git-gui. That is, the conflict markers, and common ancestor lines, are treated as being part of the current

git-gui: failure to distinguish 3-way common ancestors in hunk markers (#2340)

2019-09-24 Thread Philip Oakley
Hi list, cc Pratyush, While rebasing an old series, I had a 3-way merge fall back that didn't show the `||| merged common ancestors` very well in git-gui. That is, the conflict markers, and common ancestor lines, are treated as being part of the current HEAD hunk, rather than being separa

Re: Git in Outreachy December 2019?

2019-09-23 Thread Philip Oakley
On 23/09/2019 20:40, Jeff King wrote: On Fri, Sep 20, 2019 at 06:47:01PM -0700, Emily Shaffer wrote: """ "Did You Mean..?" There are some situations where it's fairly clear what a user meant to do, even though they did not do that thing correctly. For example, if a user runs `git commit` with

Re: [PATCH v2 0/6] multi-pack-index: add --no-progress

2019-09-20 Thread Philip Oakley
Hi William, welcome. On 20/09/2019 17:53, William Baker via GitGitGadget wrote: Hello Git contributors! My name is William Baker and I work at Microsoft. Over the past few years I've worked closely with the Microsoft team contributing to the git ecosystem and I'm excited to start working with t

Re: [DISCUSSION] Growing the Git community

2019-09-20 Thread Philip Oakley
Hi All, Some rhetorical top level systemy thinking... On 19/09/2019 17:30, Derrick Stolee wrote: During the Virtual Git Contributors' Summit, Dscho brought up the topic of "Inclusion & Diversity". We discussed ideas for how to make the community more welcoming to new contributors of all kinds.

Re: [PATCH] doc: MyFirstContribution: fix cmd placement instructions

2019-09-20 Thread Philip Oakley
On 19/09/2019 21:46, Emily Shaffer wrote: Thanks for sending this. I guess I don't know the alphabet very well :) A different color we could paint the bikeshed would be to write "add a new line for `psuh` immediately after it" in these places instead. But I have no preference whatsoever. - Em

Re: Git versioning policy - PatchMyPC compatibility on Windows

2019-09-14 Thread Philip Oakley
On 14/09/2019 20:38, brian m. carlson wrote: On 2019-09-14 at 12:49:40, Audric GUERIN wrote: Hi, I use PatchMyPC to keep all my applications up to date on Windows but there is one application that is never properly detected as up to date... and it is Git as you guessed. According to Justin Cha

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-12 Thread Philip Oakley
On 12/09/2019 22:34, Marc Branchaud wrote: I just tested what happens when you press Ctrl+e while Caps Lock is enabled; the Ctrl+e binding is not invoked. That's probably why other key bindings have the same function bound for both lower- and upper-case letters, to have the same behaviour with/wi

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-12 Thread Philip Oakley
On 12/09/2019 20:44, Bert Wesarg wrote: Its a bi-state anyway and also safes one line in the menu. s/safes/saves/  ? Signed-off-by: Bert Wesarg --- Philip

Re: [PATCH 1/2] git-gui: warn if the commit message contains lines longer than the set limit

2019-09-06 Thread Philip Oakley
Hi Birger, On 06/09/2019 15:08, Birger Skogeng Pedersen wrote: Hi Bert, We should probably distinguish between what is wrapped in git-gui (i.e. purely visual), and what is actually wrapped in the commit message. I believe the former is referred to as "soft wrap", while the latter is "hard wrap

Re: Git does not recognise directory named '${sys:DATA_ROOT_DIR}'

2019-09-03 Thread Philip Oakley
On 03/09/2019 15:11, Σταύρος Ντέντος wrote: The original folder did had a folder structure 3 levels deep. Unfortunately, I don't remember if the leaves were files (or directories themselves). However, since I "replicated" it, I went ahead and cleaned up my main repo (sigh). Thank you for remindi

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-02 Thread Philip Oakley
mately the label could be tweaked to have say the 4char prefix to fool the Windows 'starts with' name detection - which assumes I understand how some of those bad filenames are detected... On Mon, Sep 2, 2019, 5:24 PM Philip Oakley wrote: On 02/09/2019 19:29, Junio C Hamano wrote:

Re: [PATCH 1/1] rebase -r: let `label` generate safer labels

2019-09-02 Thread Philip Oakley
On 02/09/2019 19:29, Junio C Hamano wrote: I see there are "lets make sure it is unique by suffixing "-%d" in other codepaths; would that help if this piece of code yields a label that is not unique? maybe use a trailing 4 characters  of the oid to get a reasonably unique label? Oh, just seen

Re: [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-02 Thread Philip Oakley
On 02/09/2019 13:25, Pratyush Yadav wrote: On 01/09/19 11:27PM, Philip Oakley wrote: Hi Pratyus, On 01/09/2019 12:32, Pratyush Yadav wrote: Hi Birger, In case you haven't been following the list, Pat has been inactive recently, so I am acting as the interim maintainer of git-gui fo

Re: [BUG} stash show does not show untracked files stashed (reposted)

2019-09-02 Thread Philip Oakley
On 02/09/2019 14:01, Giuseppe Crinò wrote: Suppose I have files a,b,c,d modified, but only file d is in the index. After stash push (or save) --include-untracked, stash show only displays file d. A subsequent pop will restore files a,b,c,d. So functionally push and pop are fine, but stash show a

Re: Retrieve version-string on shallow clone

2019-09-02 Thread Philip Oakley
Hi Reino On 01/09/2019 12:07, Reino Wijnsma wrote: Hello git@vger.kernel.org, Two days ago I started https://github.com/mstorsjo/fdk-aac/issues/107, asking how to retrieve the fdk-aac version-string on a shallow clone. My question was of course not fdk-aac related, so Martin Storsjö suggested

Re: [PATCH] git-gui: Add hotkeys to set widget focus

2019-09-01 Thread Philip Oakley
Hi Pratyus, On 01/09/2019 12:32, Pratyush Yadav wrote: Hi Birger, In case you haven't been following the list, Pat has been inactive recently, so I am acting as the interim maintainer of git-gui for now, because no one else stepped up and Junio would rather not maintain it. You can find my fork

Re: How to track history of personal changes in a repository?

2019-08-31 Thread Philip Oakley
Hi Elijah, Matt On 30/08/2019 16:21, Elijah Newren wrote: * If the changes are to files that are tracked, AND you aren't making changes to those same files that do need to be committed and pushed, use the assume-unchanged bit (see git-update-index(1)). Not sure I parsed that well but... The `a

Re: [PATCH v9 9/9] rebase: teach rebase --keep-base

2019-08-25 Thread Philip Oakley
On 25/08/2019 10:12, Denton Liu wrote: A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquash, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This i

Re: [Feature Request] Option to make .git not read-only in cloned repos

2019-08-25 Thread Philip Oakley
On 25/08/2019 20:58, Albert Vaca Cintora wrote: On Sun, Aug 25, 2019 at 7:54 PM Johannes Sixt wrote: Am 23.08.19 um 22:43 schrieb Albert Vaca Cintora: However, I'm sure that a large percentage of developers out there will agree with me that having to use force (-f) to delete every cloned repo

Re: [PATCH] t7300-clean: demonstrate deleting nested repo with an ignored file breakage

2019-08-25 Thread Philip Oakley
Hi Szeder, On 25/08/2019 19:59, SZEDER Gábor wrote: 'git clean -fd' must not delete an untracked directory if it belongs s/untracked// I don't believe it should matter either way for a sub-module (sub-directory). to a different Git repository or worktree. msybr split the assertion from the f

Re: [PATCH v2 20/23] .gitignore: touch up the entries regarding Visual Studio

2019-08-25 Thread Philip Oakley
Hi Szeder, On 25/08/2019 20:09, SZEDER Gábor wrote: On Sun, Aug 25, 2019 at 02:20:32PM +0100, Philip Oakley wrote: Hi Szeder, On 25/08/2019 13:07, SZEDER Gábor wrote: On Mon, Jul 29, 2019 at 01:08:14PM -0700, Philip Oakley via GitGitGadget wrote: Add the Microsoft .manifest pattern, and do

Re: [PATCH v2 20/23] .gitignore: touch up the entries regarding Visual Studio

2019-08-25 Thread Philip Oakley
Hi Szeder, On 25/08/2019 13:07, SZEDER Gábor wrote: On Mon, Jul 29, 2019 at 01:08:14PM -0700, Philip Oakley via GitGitGadget wrote: Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multip

Re: [PATCH v3 13/13] format-patch: learn --infer-cover-subject option

2019-08-24 Thread Philip Oakley
On 24/08/2019 09:03, Denton Liu wrote: On Fri, Aug 23, 2019 at 01:18:44PM -0700, Junio C Hamano wrote: Philip Oakley writes: Perhaps the `--infer-cover-subject` the config option needs to be multi-valued to include: "subject" (always expect short first lines) or "m

Re: [PATCH v3 13/13] format-patch: learn --infer-cover-subject option

2019-08-23 Thread Philip Oakley
On 23/08/2019 19:15, Denton Liu wrote: Having said that, I suspect that in the longer term, people would want to see this new behaviour with a bit of tweak become the new default. The "tweak" I suspect is needed is to behave sensibly when "the first line" ends up to be too long a subject. Wh

Re: [ANNOUNCE] Git Rev News edition 54

2019-08-21 Thread Philip Oakley
On 21/08/2019 15:01, Christian Couder wrote: Hi everyone, The 54th edition of Git Rev News is now published: https://git.github.io/rev_news/2019/08/21/edition-54/ Thanks a lot to Elijah Newren, Jeff Hostetler, Andrew Ardill and Jean-Noël Avila who contributed this month! Enjoy, Christian,

[PATCH] .mailmap: update email address of Philip Oakley

2019-08-11 Thread Philip Oakley
My IEE 'home for life' email service is being withdrawn on 30 Sept 2019. Replace with my new email domain. I also have a secondary (backup) 'home for life' through . Signed-off-by: Philip Oakley Signed-off-by: Philip Oakley --- .mailmap | 1 + 1 file changed, 1 insert

Re: $> git branch splat response considered harmful

2019-08-09 Thread Philip Oakley
On 08/08/2019 22:28, Emily Shaffer wrote: On Thu, Aug 8, 2019 at 2:20 PM Bryan Turner wrote: On Thu, Aug 8, 2019 at 2:08 PM wrote: fwiw, jimc@frodo:~/prj-1/capnproto.git$ git branch -l * master I find the splat in the response unhelpful when wrapped in shell for loop, the splat expands into

[PATCH v2 09/23] contrib/buildsystems: ignore gettext stuff

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Git's build contains steps to handle internationalization. This caused hiccups in the parser used to generate QMake/Visual Studio project files. As those steps are irrelevant in this context, let's just ignore them. Signed-off-by: Philip Oakley Signed-off-by

[PATCH v2 05/23] contrib/buildsystems: ignore invalidcontinue.obj

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also

[PATCH v2 10/23] contrib/buildsystems: redirect errors of the dry run into a log file

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Rather than swallowing the errors, it is better to have them in a file. To make it obvious what this is about, use the file name 'msvc-build-makedryerrors.txt'. Further, if the output is empty, simply delete that file. As we target Git for Windows' SDK (wh

[PATCH v2 08/23] contrib/buildsystems: handle quoted spaces in filenames

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The engine.pl script expects file names not to contain spaces. However, paths with spaces are quite prevalent on Windows. Use shellwords() rather than split() to parse them correctly. Helped-by: Junio C Hamano Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin

[PATCH v2 20/23] .gitignore: touch up the entries regarding Visual Studio

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multiple projects (one per target). Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- .gitignore | 5 +

[PATCH v2 07/23] contrib/buildsystems: fix misleading error message

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The error message talked about a "lib option", but it clearly referred to a link option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH v2 02/23] Vcproj.pm: list git.exe first to be startup project

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Visual Studio takes the first listed application/library as the default startup project [1]. Detect the 'git' project and place it at the head of the project list, rather than at the tail. Export the apps list before libs list for both the projects and global str

[PATCH v2 13/23] contrib/buildsystems: handle the curl library option

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Upon seeing the '-lcurl' option, point to the libcurl.lib. While there, fix the elsif indentation. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) di

[PATCH v2 11/23] contrib/buildsystems: optionally capture the dry-run in a file

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out ` in subsequent runs via the `--in ` option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin

[PATCH 07/24] contrib/buildsystems: fix misleading error message

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The error message talked about a "lib option", but it clearly referred to a link option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 09/24] contrib/buildsystems: ignore gettext stuff

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Git's build contains steps to handle internationalization. This caused hiccups in the parser used to generate QMake/Visual Studio project files. As those steps are irrelevant in this context, let's just ignore them. Signed-off-by: Philip Oakley Signed-off-by

[PATCH 08/24] contrib/buildsystems: handle quoted spaces in filenames

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The engine.pl script expects file names not to contain spaces. However, paths with spaces are quite prevalent on Windows. Use shellwords() rather than split() to parse them correctly. Helped-by: Junio C Hamano Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin

[PATCH 13/24] contrib/buildsystems: handle the curl library option

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Upon seeing the '-lcurl' option, point to the libcurl.lib. While there, fix the elsif indentation. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) di

[PATCH 05/24] contrib/buildsystems: ignore invalidcontinue.obj

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also

[PATCH 10/24] contrib/buildsystems: redirect errors of the dry run into a log file

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Rather than swallowing the errors, it is better to have them in a file. To make it obvious what this is about, use the file name 'msvc-build-makedryerrors.txt'. Further, if the output is empty, simply delete that file. As we target Git for Windows' SDK (wh

[PATCH 11/24] contrib/buildsystems: optionally capture the dry-run in a file

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out ` in subsequent runs via the `--in ` option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin

[PATCH 20/24] .gitignore: touch up the entries regarding Visual Studio

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multiple projects (one per target). Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- .gitignore | 5 +

[PATCH 02/24] Vcproj.pm: list git.exe first to be startup project

2019-07-18 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Visual Studio takes the first listed application/library as the default startup project [1]. Detect the 'git' project and place it at the head of the project list, rather than at the tail. Export the apps list before libs list for both the projects and global str

Re: Git Test Coverage Report (Wed. July 10)

2019-07-11 Thread Philip Oakley
'master@{1}' builtin/branch.c 1fde99cf 841) die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n" [snip] Commits introducting uncovered code: ... Philip Oakley 1fde99cf doc branch: provide examples for listing remote tracking branches

Re: Virtual Git Contributor Summit

2019-07-05 Thread Philip Oakley
Hi Dscho, On 03/07/2019 14:01, Johannes Schindelin wrote: Team, I kept talking about this idea of a purely online Git Contributor Summit, and it is finally time for action. The idea: just like the Git Contributor Summits we have on the day before GitMerge, but instead of traveling to the same

Re: [PATCH] make slash-rules more readable

2019-07-04 Thread Philip Oakley
Oops, I missed Junio's message [1] while looking through my backlog. Sorry for the noise. Philip On 04/07/2019 11:40, Philip Oakley wrote: If all the issues are cleared then I believe it is a case of providing a clean reroll (maybe identical to previous..) to Junio and the list to co

Re: [PATCH] make slash-rules more readable

2019-07-04 Thread Philip Oakley
On 27/06/2019 18:10, Dr. Adam Nielsen wrote: On 25.06.19 13:31, Philip Oakley wrote: only one minor point... >>> + - For example, a pattern `doc/frotz/` matches `doc/frotz` directory, >>> +   but not `a/doc/frotz` directory; however `frotz/` matches `frotz` > > her

Re: Tracking parent branches in Git

2019-07-03 Thread Philip Oakley
On 02/07/2019 20:24, Theodore Ts'o wrote: I think the real problem with all of this feature request is that it's all presuming a particular workflow, and git is currently*not* strongly opinionated about the workflow. I'd suggest that git does have a clear preference for a workflow that is based

Re: Tracking parent branches in Git

2019-07-02 Thread Philip Oakley
On 01/07/2019 21:12, rsbec...@nexbridge.com wrote: On July 1, 2019 3:48 PM, Bryan Turner wrote: On Mon, Jul 1, 2019 at 12:35 PM Junio C Hamano wrote: Eric Kulcyk writes: [Overly long lines are not appreciated around here.] We would like to track parent branches so that creating pull request

[PATCH v3 17/20] msvc: add pragmas for common warnings

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley MSVC can be overzealous about some warnings. Disable them. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- compat/msvc.h | 4 1 file changed, 4 insertions(+) diff --git a/compat/msvc.h b/compat/msvc.h index d7525cf61d..1d7a8c6145 100644 --- a

[PATCH v3 09/20] msvc: define O_ACCMODE

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley This constant is not defined in MSVC's headers. In UCRT's fcntl.h, _O_RDONLY, _O_WRONLY and _O_RDWR are defined as 0, 1 and 2, respectively. Yes, that means that UCRT breaks with the tradition that O_RDWR == O_RDONLY | O_WRONLY. It is a perfectly legal way to de

[PATCH v3 08/20] msvc: include sigset_t definition

2019-06-25 Thread Philip Oakley via GitGitGadget
From: Philip Oakley On MSVC (VS2008) sigset_t is not defined. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- compat/msvc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/msvc.h b/compat/msvc.h index 29a8ce8204..04b4750b87 100644 --- a/compat/msvc.h +++ b

  1   2   3   4   5   6   7   8   9   10   >