Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

2018-01-18 Thread Philip Oakley
From: "Jacob Keller" On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: Jake suggested using "x false" instead of "edit" for some corner cases. I do prefer using "x false" for all kinds of things such as stopping before a commit (edit only

Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

2018-01-18 Thread Philip Oakley
From: "Johannes Schindelin" This one is a bit tricky to explain, so let's try with a diagram: C / \ A - B - E - F \ / D To illustrate what this new mode is all about, let's consider what happens upon `git rebase -i --recreate-merges B`, in

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-18 Thread Philip Oakley
From: "Johannes Schindelin" The sequencer just learned a new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

2018-01-18 Thread Philip Oakley
From: "Jacob Keller" On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: This commit implements the commands to label, and to reset to, given revisions. The syntax is: label reset As a convenience shortcut, also

Re: [PATCH] Remoted unnecessary void* from hashmap.h that caused compile warnings

2018-01-14 Thread Philip Oakley
From: Subject: [PATCH] Remoted unnecessary void* from hashmap.h that caused compile warnings s/Remoted/Removed/ ? Maybe shorten to " hashmap.h: remove unnecessary void* " (ex the superflous spaces) -- Philip From: "Randall S. Becker"

Re: [PATCH/RFC] diff: add --compact-summary option to complement --stat

2018-01-13 Thread Philip Oakley
(one spelling spotted).. From: "Nguyễn Thái Ngọc Duy" This is partly inspired by gerrit web interface which shows diffstat like this, e.g. with commit 0433d533f1 (notice the "A" column on the third line): Documentation/merge-config.txt | 4 + builtin/merge.c

Re: Errors and other unpleasant things found by Cppcheck

2018-01-08 Thread Philip Oakley
From: "Friedrich Spee von Langenfeld" Hi, I analyzed the GitHub repository with Cppcheck. The resulting XML file is attached. Please open it in Cppcheck to view it comfortably. Especially the bunch of errors could be of interest to you. Hi, Thanks for the submission.

Re: Re: Unify annotated and non-annotated tags

2017-12-24 Thread Philip Oakley
From: "anatoly techtonik" <techto...@gmail.com> From: Philip Oakley > So if I understand correctly, the hope is that `git show-ref --tags` > could > get an alternate option `--all-tags` [proper option name required...] > such > that the user would not

Re: [WIP 12/15] ls-refs: introduce ls-refs server command

2017-12-13 Thread Philip Oakley
From: "Brandon Williams" Sent: Monday, December 04, 2017 11:58 PM Introduce the ls-refs server command. In protocol v2, the ls-refs command is used to request the ref advertisement from the server. Since it is a command which can be requested (as opposed to manditory in

Re: [PATCH 0/8] Codespeed perf results

2017-12-13 Thread Philip Oakley
From: "Christian Couder" This patch series is built on top of cc/perf-run-config which recently graduated to master. It makes it possible to send perf results to a Codespeed server. See https://github.com/tobami/codespeed/ and web sites like http://speed.pypy.org/

Re: [PATCH] partial-clone: design doc

2017-12-13 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: + These filtered packfiles are incomplete in the traditional sense because + they may contain trees that reference blobs that the client does not have. Is a comment n

Re: [PATCH] partial-clone: design doc

2017-12-12 Thread Philip Oakley
From: "Jeff Hostetler" From: Jeff Hostetler First draft of design document for partial clone feature. Signed-off-by: Jeff Hostetler Signed-off-by: Jonathan Tan ---

Re: Re: Re: bug deleting "unmerged" branch (2.12.3)

2017-12-12 Thread Philip Oakley
ary could have definitions for "merged" and "fully merged" with manual pages referring to it. Thanks, I'll add your note to my list of clarifications. Philip Regards, Ulrich "Philip Oakley" <philipoak...@iee.org> schrieb am 08.12.2017 um 21:26 in Nachricht &

Re: What's cooking in git.git (Dec 2017, #02; Thu, 7)

2017-12-12 Thread Philip Oakley
From: "Christian Couder" On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote: * jh/object-filtering (2017-12-05) 9 commits (merged to 'next' on 2017-12-05 at 3a56b51085) + rev-list: support --no-filter argument +

Re: Re: bug deleting "unmerged" branch (2.12.3)

2017-12-08 Thread Philip Oakley
k or suggestions you could provide. -- Philip >>> "Philip Oakley" <philipoak...@iee.org> 04.12.17 0.30 Uhr >>> From: "Junio C Hamano" <gits...@pobox.com> > "Philip Oakley" <philipoak...@iee.org> writes: > >> I think it was t

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-05 Thread Philip Oakley
From: "Jeff Hostetler" <g...@jeffhostetler.com> Sent: Monday, December 04, 2017 3:36 PM On 12/2/2017 11:30 AM, Philip Oakley wrote: From: "Jeff Hostetler" <g...@jeffhostetler.com> Sent: Friday, December 01, 2017 2:30 PM On 11/30/2017 8:51 PM, Vitaly Arbuzov w

Re: [RFE] Inverted sparseness (amended)

2017-12-05 Thread Philip Oakley
From: "Randall S. Becker" <rsbec...@nexbridge.com> On December 3, 2017 6:14 PM, Philip Oakley wrote a nugget of wisdom: From: "Randall S. Becker" <rsbec...@nexbridge.com> [...] If using the empty tree part doesn't pass muster (i.e. showing nothing isn't su

Re: [RFE] Inverted sparseness

2017-12-04 Thread Philip Oakley
From: "Randall S. Becker" :December 03, 2017 11:44 PM On December 3, 2017 6:14 PM, Philip Oakley wrote a nugget of wisdom: From: "Randall S. Becker" <rsbec...@nexbridge.com> Sent: Friday, December 01, 2017 6:31 PM On December 1, 2017 1:19 PM, Jeff Hostetler wro

Re: bug deleting "unmerged" branch (2.12.3)

2017-12-03 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: I think it was that currently you are on M, and neither A nor B are ancestors (i.e. merged) of M. As Junio said:- "branch -d" protects branches that ar

Re: [RFE] Inverted sparseness

2017-12-03 Thread Philip Oakley
From: "Randall S. Becker" Sent: Friday, December 01, 2017 6:31 PM On December 1, 2017 1:19 PM, Jeff Hostetler wrote: On 12/1/2017 12:21 PM, Randall S. Becker wrote: I recently encountered a really strange use-case relating to sparse clone/fetch that is really backwards

Re: Re: Unify annotated and non-annotated tags

2017-12-02 Thread Philip Oakley
From: "anatoly techtonik" comment at end - Philip On Fri, Nov 24, 2017 at 1:24 PM, Ævar Arnfjörð Bjarmason wrote: On Fri, Nov 24, 2017 at 10:52 AM, anatoly techtonik wrote: On Thu, Nov 23, 2017 at 6:08 PM, Randall S. Becker

Re: Re: bug deleting "unmerged" branch (2.12.3)

2017-12-02 Thread Philip Oakley
From: "Ulrich Windl" To: Cc: Sent: Wednesday, November 29, 2017 8:32 AM Subject: Antw: Re: bug deleting "unmerged" branch (2.12.3) "Ulrich Windl" writes: I think if more than

Re: Antw: Re: bug deleting "unmerged" branch (2.12.3)

2017-12-02 Thread Philip Oakley
Hi Ulrich From: "Johannes Schindelin" To: "Ulrich Windl" Cc: Sent: Wednesday, November 29, 2017 12:27 PM Subject: Re: Antw: Re: bug deleting "unmerged" branch (2.12.3) Hi Ulrich, On Wed, 29 Nov 2017,

Re: [add-default-config] add --default option to git config.

2017-12-02 Thread Philip Oakley
From: "Soukaina NAIT HMID" From: Soukaina NAIT HMID From a coursory read, there does need a bit more explanation. I see you also add a --color description and code, and don't say what the problem being solved is. If it is trickty to

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-02 Thread Philip Oakley
From: "Jeff Hostetler" <g...@jeffhostetler.com> Sent: Friday, December 01, 2017 5:23 PM On 11/30/2017 6:43 PM, Philip Oakley wrote: From: "Vitaly Arbuzov" <v...@uber.com> [...] comments below.. On Thu, Nov 30, 2017 at 9:01 AM, Vitaly Arbuzov <v...@uber.co

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-02 Thread Philip Oakley
Hi Jonathan, Thanks for the outline. It has help clarify some points and see the very similar alignments. The one thing I wasn't clear about is the "promised" objects/remote. Is that "promisor" remote a fixed entity, or could it be one of many remotes that could be a "provider"? (sort of

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-02 Thread Philip Oakley
From: "Jeff Hostetler" Sent: Friday, December 01, 2017 2:30 PM On 11/30/2017 8:51 PM, Vitaly Arbuzov wrote: I think it would be great if we high level agree on desired user experience, so let me put a few possible use cases here. 1. Init and fetch into a new repo with

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-02 Thread Philip Oakley
vel. (I'm hoping I've understood the dispersement of data between index and narrow packs corrrectly here ;-) -- Philip On Thu, Nov 30, 2017 at 3:43 PM, Philip Oakley <philipoak...@iee.org> wrote: From: "Vitaly Arbuzov" <v...@uber.com> Found some details here: https

Re: How hard would it be to implement sparse fetching/pulling?

2017-11-30 Thread Philip Oakley
From: "Vitaly Arbuzov" Found some details here: https://github.com/jeffhostetler/git/pull/3 Looking at commits I see that you've done a lot of work already, including packing, filtering, fetching, cloning etc. What are some areas that aren't complete yet? Do you need any help

Re: [PATCH v3 5/5] Testing: provide tests requiring them with ellipses after SHA-1 values

2017-11-22 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: From: "Junio C Hamano" <gits...@pobox.com> Ann T Ropea <bedhan...@gmx.de> writes: *1* We are being overly generous in t4013-diff-various.sh

Re: [PATCH] git-send-email: fix get_maintainer.pl regression

2017-11-20 Thread Philip Oakley
From: "Eric Sunshine" On Sat, Nov 18, 2017 at 9:54 PM, Eric Sunshine wrote: On Thu, Nov 16, 2017 at 10:48 AM, Alex Bennée wrote: +test_expect_success $PREREQ 'cc trailer with get_maintainer output' ' + [...] +

Re: [PATCH 6/7] builtin/describe.c: describe a blob

2017-11-20 Thread Philip Oakley
From: "Philip Oakley" <philipoak...@iee.org> s/with/without/ ... From: "Junio C Hamano" <gits...@pobox.com> : Friday, November 10, 2017 1:24 AM [catch up] "Philip Oakley" <philipoak...@iee.org> writes: From: "Stefan B

Re: [PATCH 6/7] builtin/describe.c: describe a blob

2017-11-20 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> : Friday, November 10, 2017 1:24 AM [catch up] "Philip Oakley" <philipoak...@iee.org> writes: From: "Stefan Beller" <sbel...@google.com> Rereading this discussion, there is currently no urgent thing to

Re: [PATCHv5 7/7] builtin/describe.c: describe a blob

2017-11-20 Thread Philip Oakley
From: "Stefan Beller" Sent: Thursday, November 16, 2017 2:00 AM [in catch up mode..] Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) When describing commits, we

Re: [PATCH v3 5/5] Testing: provide tests requiring them with ellipses after SHA-1 values

2017-11-20 Thread Philip Oakley
From: "Junio C Hamano" Ann T Ropea writes: *1* We are being overly generous in t4013-diff-various.sh because we do not want to destroy/take apart the here-document. Given that all this a temporary measure, we should get away with it. So, the need to

Re: more pedantry ... what means a file "known to Git"?

2017-11-13 Thread Philip Oakley
From: "Robert P. J. Day" apologies for more excruciating nitpickery, but i ask since it seems that phrase means slightly different things depending on where you read it. first, i assume that there are only two categories: 1) files known to Git 2) files unknown to

Re: [PATCH 00/30] Add directory rename detection to git

2017-11-13 Thread Philip Oakley
From: "Elijah Newren" <new...@gmail.com> : Friday, November 10, 2017 11:26 PM On Fri, Nov 10, 2017 at 2:27 PM, Philip Oakley <philipoak...@iee.org> wrote: From: "Elijah Newren" <new...@gmail.com> In this patchset, I introduce directory rename detectio

Re: [PATCH 00/30] Add directory rename detection to git

2017-11-10 Thread Philip Oakley
From: "Elijah Newren" [This series is entirely independent of my rename detection limits series. However, I have a separate rename detection performance series that depends on both this series and the rename detection limits series.] In this patchset, I introduce directory

Re: [PATCH 6/7] builtin/describe.c: describe a blob

2017-11-09 Thread Philip Oakley
From: "Stefan Beller" Rereading this discussion, there is currently no urgent thing to address? True. Then the state as announced by the last cooking email, to just cook it, seems about right and we'll wait for further feedback. Possibly only checking the documenation

Re: [PATCH 1/3] checkout: describe_detached_head: remove 3dots after committish

2017-11-09 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> Sent: Wednesday, November 08, 2017 1:59 AM "Philip Oakley" <philipoak...@iee.org> writes: But... ... This change causes quite a few tests to fall over; however, they all have truncated-something-longer-ellipses i

Re: [PATCH 1/3] checkout: describe_detached_head: remove 3dots after committish

2017-11-07 Thread Philip Oakley
From: "Ann T Ropea" Thanks for all the feedback provided! I'd like to summarise what consensus we have reached so far and then propose a way forward: * we'll use the term "ellipsis (pl. ellipses)" for what's been referred to as "3dots", "n-dots", "many dots" and so

Re: [PATCH 1/3] checkout: describe_detached_head: remove 3dots after committish

2017-11-06 Thread Philip Oakley
From: "Junio C Hamano" Ann T Ropea writes: This could be confusing not only for novices; in either case, no range should be insinuated by describe_detached_head. We actually do not insinuate any range in these output. These dots denote "truncated at

Re: [PATCH 6/7] builtin/describe.c: describe a blob

2017-11-06 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> Sent: Sunday, November 05, 2017 6:28 AM "Philip Oakley" <philipoak...@iee.org> writes: Is this not also an alternative case, relative to the user, for the scenario where the user has an oid/sha1 value but does not

Re: [PATCH 6/7] builtin/describe.c: describe a blob

2017-11-04 Thread Philip Oakley
From: "Junio C Hamano" Sent: Thursday, November 02, 2017 4:23 AM Junio C Hamano writes: The reason why we say "-ish" is "Yes we know v2.15.0 is *NOT* a commit object, we very well know it is a tag object, but because we allow it to be used in a context

Re: How to resolve mixture of modified and deleted conflicts easily in git?

2017-11-04 Thread Philip Oakley
From: "Robert Dailey" When doing a rebase, sometimes I will get `DU` and `UU` conflicts (locally deleted and locally modified, respectively). Furthermore, in some of these cases, I want to take "ours" for all conflicts, including ones where the local file is deleted.

Re: Git Open Source Weekend London 11th/12th November

2017-11-04 Thread Philip Oakley
From: "Jeff King" On Wed, Nov 01, 2017 at 04:36:24PM +, Thomas Gummerer wrote: Normally attendees work in small groups on a specific task to prevent anyone from getting stuck. Per usual, Bloomberg will provide the venue, mentors, snacks and drinks. Bring your enthusiasm

Re: Meaning of two commit-ish hash in git diff

2017-10-31 Thread Philip Oakley
Yubin , From: "Junio C Hamano" Yubin Ruan writes: diff --git a/path/somefile b/path/somefile index f8886b4..a1c96df 100644 --- a/path/somefile +++ b/path/somefile This is output by a `git diff` between two adjacent commits but they are not any

Re: [RFC] protocol version 2

2017-10-28 Thread Philip Oakley
From: "Brandon Williams" Sent: Friday, October 20, 2017 6:18 PM Objective === Replace Git's current wire protocol with a simpler, less wasteful protocol that can evolve over time. Capability Advertisement -- A server which decides to

Re: How to re-merge paths differently?

2017-10-28 Thread Philip Oakley
From: "Philip Oakley" <philipoak...@iee.org> From: "Sergey Organov" <sorga...@gmail.com> Is there anything like this: $ git merge b [... lot of conflicts ...] $ git re-merge -X ours -- x/ # Leaves 0 conflicts in x/ $ git re-merge -X theirs -- y/ # Leave

Re: How to re-merge paths differently?

2017-10-28 Thread Philip Oakley
From: "Sergey Organov" Is there anything like this: $ git merge b [... lot of conflicts ...] $ git re-merge -X ours -- x/ # Leaves 0 conflicts in x/ $ git re-merge -X theirs -- y/ # Leaves 0 conflicts in y/ [... resolve the rest of conflicts manually ...] $ git commit

Re: [PATCH 0/6] Create Git/Packet.pm

2017-10-23 Thread Philip Oakley
Hi Junio, From: "Junio C Hamano" Christian Couder writes: Goal Totally offtopic, but is it only me who finds these "section headers" in cover letters from some people irritating and/or jarring? Personally I find that, for significant

Re: [PATCH v2] sequencer.c: fix and unify error messages in rearrange_squash()

2017-10-16 Thread Philip Oakley
From: "Johannes Schindelin" On Mon, 16 Oct 2017, Junio C Hamano wrote: Ralf Thielow writes: > When the write opertion fails, we write that we could > not read. Change the error message to match the operation > and remove the full stop at

Re: [PATCH] submodule: avoid sentence-lego in translated string

2017-10-08 Thread Philip Oakley
From: "Martin Ågren" We currently build an error message like "entry is a %s, not a commit", where the placeholder will be replaced with "blob", "tag" or "tree". Apart from those three placeholder words not being translated, in some languages it might be awkward or

Re: RFC v3: Another proposed hash function transition plan

2017-09-15 Thread Philip Oakley
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: [idea] File history tracking hints

2017-09-14 Thread Philip Oakley
From: "Johannes Schindelin" <johannes.schinde...@gmx.de> Hi Philip, On Mon, 11 Sep 2017, Philip Oakley wrote: From: "Pavel Kretov" <fireguraf...@gmail.com> > Hi all, > > Excuse me if the topic I'm going to raise here has been already > discussed

Re: [idea] File history tracking hints

2017-09-11 Thread Philip Oakley
From: "Pavel Kretov" Hi all, Excuse me if the topic I'm going to raise here has been already discussed on the mailing list, forums, or IRC, but I couldn't find anything related. The problem: Git, being "a stupid content tracker", doesn't try to keep an eye on

Re: [BUG] rebase -i with only empty commits

2017-08-23 Thread Philip Oakley
From: "Johannes Schindelin" So the problem seems to be that rebase -i (like rebase without -i) considers "empty commits" as commits to be ignored. However, when using rebase -i one expects that you can include the empty commit... Also, the behavior is odd. When I

Re: Would it make sense to add `--depth=0` feature?

2017-08-12 Thread Philip Oakley
From: "ankostis" Would it be feasible/sensical to support clone/fetch with --depth=0? The point is to download the tags/commit objects but not the actual trees and blobs, creating a "ledger" acting as a promise for the remote'e repo content? Is there some estimation of the

Re: [PATCH v2 1/2] format-patch: have progress option while generating patches

2017-08-12 Thread Philip Oakley
From: "Junio C Hamano" Jeff King writes: On Thu, Aug 10, 2017 at 02:32:55PM -0400, Kevin Willford wrote: @@ -1493,6 +1496,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) OPT_FILENAME(0, "signature-file", _file, N_("add a

Re: [PATCH 1/2] doc: fix small issues in SubmittingPatches

2017-08-01 Thread Philip Oakley
From: "Stefan Beller" Further, remove duplicated space character. https://en.wikipedia.org/wiki/Sentence_spacing seems like a globally controversial thing. (I assumed it was some sort of local dialect before researching it properly) I personally do not mind one way or

Re: Contact with Latinamerica

2017-07-31 Thread Philip Oakley
From: "Christopher Díaz" <christopher.diaz@gmail.com> Hi Christopher, I've included the Git list to keep the discussion open to all the community. (we usually use reply all) El dom, 30-07-2017 a las 19:01 +0100, Philip Oakley escribió: Hi Philip, Thank you very much

Re: Contact with Latinamerica

2017-07-30 Thread Philip Oakley
From: "Christopher Díaz" My name is Christopher Díaz Riveros, I'm a software development student in Lima, Peru. For some time now I have been supporting my Linux community, Gentoo Linux, and I have discovered a wide world of possibilities in open source. I tell

Re: Expected behavior of "git check-ignore"...

2017-07-30 Thread Philip Oakley
From: "Junio C Hamano" Sent: Thursday, July 27, 2017 6:05 PM John Szakmeister writes: On Mon, Jul 24, 2017 at 3:23 PM, Junio C Hamano wrote: [snip] I am reasonably sure that the command started its life as a pure debugging aid.

Re: [PATCH 1/2] doc: fix small issues in SubmittingPatches

2017-07-30 Thread Philip Oakley
From: "Kaartic Sivaraam" minor nit: It's nice, for these single character changes, to give a clue in the commit message as to what to look for. E.g. Quote the command, and remove duplicated space character -- Philip. Signed-off-by: Kaartic Sivaraam

Re: [RFC PATCH v2 2/4] promised-object, fsck: introduce promised objects

2017-07-29 Thread Philip Oakley
From: "Ben Peart" Sent: Tuesday, July 25, 2017 4:10 PM On 7/21/2017 4:33 PM, Jonathan Tan wrote: On Fri, 21 Jul 2017 12:24:52 -0400 Ben Peart wrote: Today we have 3.5 million objects * 30 bytes per entry = 105 MB of promises. Given the average

Re: [RFC PATCH 0/3] Partial clone: promised blobs (formerly "missing blobs")

2017-07-29 Thread Philip Oakley
From: "Jonathan Nieder" <jrnie...@gmail.com> Sent: Monday, July 17, 2017 7:03 PM Hi Philip, Philip Oakley wrote: From: "Jonathan Tan" <jonathanta...@google.com> These patches are part of a set of patches implementing partial clone, as you can see here: http

Re: [RFC PATCH 0/3] Partial clone: promised blobs (formerly "missing blobs")

2017-07-25 Thread Philip Oakley
Sorry for the delay - been away... From: "Ben Peart" <peart...@gmail.com> Sent: Monday, July 17, 2017 6:43 PM On 7/16/2017 11:23 AM, Philip Oakley wrote: From: "Jonathan Tan" <jonathanta...@google.com> Sent: Tuesday, July 11, 2017 8:48 PM These patc

Re: Expected behavior of "git check-ignore"...

2017-07-23 Thread Philip Oakley
From: "John Szakmeister" Sent: Thursday, July 20, 2017 11:37 AM A StackOverflow user posted a question about how to reliably check whether a file would be ignored by "git add" and expected "git check-ignore" to return results that matched git add's behavior. It turns out

Re: [RFC PATCH 0/3] Partial clone: promised blobs (formerly "missing blobs")

2017-07-16 Thread Philip Oakley
From: "Jonathan Tan" Sent: Tuesday, July 11, 2017 8:48 PM These patches are part of a set of patches implementing partial clone, as you can see here: https://github.com/jonathantanmy/git/tree/partialclone In that branch, clone with batch checkout works, as you can

Re: [PATCH] RFC: A new type of symbolic refs

2017-07-16 Thread Philip Oakley
From: "Philip Oakley" <philipoak...@iee.org> From: "Stefan Beller" <sbel...@google.com> Sent: Tuesday, July 11, 2017 2:06 AM A symbolic ref can currently only point at (another symbolic) ref. However are use cases for symbolic refs to point at other

Re: [PATCH] RFC: A new type of symbolic refs

2017-07-16 Thread Philip Oakley
From: "Stefan Beller" Sent: Tuesday, July 11, 2017 2:06 AM A symbolic ref can currently only point at (another symbolic) ref. However are use cases for symbolic refs to point at other things representing a commit-ish, such as gitlink entries in other repositories. In this

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-16 Thread Philip Oakley
From: "Junio C Hamano" Sent: Wednesday, July 12, 2017 10:29 PM William Duclot writes: - The original said "When you have resolved this problem", without giving a guidance how to resolve, and without saying what the problem is. The updated

Re: [git-for-windows] Call to developers with access to Windows XP

2017-07-12 Thread Philip Oakley
From: "Johannes Schindelin" Hi all, it has been a while since Windows XP support has been dropped from Git for Windows (v2.10.0 was the last version to support it), mainly due to the code changes inherited from Cygwin's code base, which discontinued supporting

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

2017-07-05 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> Sent: Monday, July 03, 2017 9:19 PM "Philip Oakley" <philipoak...@iee.org> writes: Am I right that the What's cooking is prepared by a script? Because I have to keep track of so many topics, its maintenance is

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

2017-07-03 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: Junio, Is it possible to include a table of contents that lists the integration branches, split by your categories, to help find areas of interest? [Graduated to &q

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

2017-07-02 Thread Philip Oakley
From: "Junio C Hamano" 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 branches, but I am still holding

Re: [PATCH] hooks: add signature to the top of the commit message

2017-07-01 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: From: "Junio C Hamano" <gits...@pobox.com> Kaartic Sivaraam <kaarticsivaraam91...@gmail.com> writes: By the way, the one that is still actu

Re: [PATCH] hooks: add signature to the top of the commit message

2017-07-01 Thread Philip Oakley
From: "Junio C Hamano" Kaartic Sivaraam writes: By the way, the one that is still actually enabled is no longer needed. The commit template generated internally was corrected some time ago not to add the "Conflicts:" section without

Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch

2017-06-10 Thread Philip Oakley
From: "Kaartic Sivaraam" On Sat, 2017-06-10 at 11:23 +0900, Junio C Hamano wrote: $ git shortlog -20 --no-merges may help learning the preferred style of writing the title. We do not say "[I] did this". Instead we phrase things in imperative mood, giving an

Re: [PATCH v1] Configure Git contribution guidelines for github.com

2017-06-10 Thread Philip Oakley
From: "Lars Schneider" Many open source projects use github.com for their contribution process. Although we mirror the Git core repository to github.com [1] we do not use any other github.com service. This is unknown/unexpected to a number of (potential) contributors

Re: What does this output of git supposed to mean ?

2017-06-07 Thread Philip Oakley
From: "Kaartic Sivaraam" <kaarticsivaraam91...@gmail.com> On Wednesday 07 June 2017 03:35 AM, Philip Oakley wrote: Maybe have a try at a patch to update the text? See the git/Documentation/SubmittingPatches for guidance. I guess this should be trivial (correct me if I'm wrong).

Re: What does this output of git supposed to mean ?

2017-06-06 Thread Philip Oakley
From: "Kaartic Sivaraam" On Tue, 2017-06-06 at 20:52 +0900, Junio C Hamano wrote: "Waiting for the initial commit", or "No commits yet", can be explained to describe the state of the current branch (not the state of the repository), and it is correct that we do

Re: What does this output of git supposed to mean ?

2017-06-06 Thread Philip Oakley
From: "David" On 6 June 2017 at 11:52, Junio C Hamano wrote: Samuel Lijin writes: For what it's worth, I've never quite understood the "Initial commit" message, because the repository is in a state where there are no commits

Re: Git Error Message

2017-06-05 Thread Philip Oakley
From: "Konstantin Khomoutov" On Sat, Jun 03, 2017 at 01:13:05AM -0700, christienne shultz wrote: I have installed the Git software and upon trying to update a repository by the "open recent repository" link and am unable to access the menu-or anything-from there.

Re: Git Merge 2017 Videos

2017-06-04 Thread Philip Oakley
From: "Christian Couder" <christian.cou...@gmail.com> On Sun, Jun 4, 2017 at 7:36 PM, Kevin Daudt <m...@ikke.info> wrote: On Sun, Jun 04, 2017 at 11:24:17AM +0100, Philip Oakley wrote: While looking at the recent .gitignore issue (the need to use `**`) I came up agai

Git Merge 2017 Videos

2017-06-04 Thread Philip Oakley
While looking at the recent .gitignore issue (the need to use `**`) I came up against a comment in https://public-inbox.org/git/cagz79kzqsaubfotjyqm+-+ljyyec2ykj5exuy5kderezfh0...@mail.gmail.com/ noting that the Git Merge 2017 videos were not available at that time. Well, a search found them on

Re: git-gui ignores core.hooksPath

2017-06-02 Thread Philip Oakley
ld be great if this could get fixed... Hi. I added core.hooksPath, glad to see it's useful to other people. This indeed is something that should be fixed, but git-gui development is managed outside of git.git, it's just occasionally pulled in. I'm not what the best place to contact is, but I've CC'd P

Re: mergetool: what to do about deleting precious files?

2017-05-30 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> Thanks for the replies. Let's see if I've got it... "Philip Oakley" <philipoak...@iee.org> writes: If I now understand correctly, the merge process flow is: * canonicalise content (eol, smudge-clean, $id, reno

Re: mergetool: what to do about deleting precious files?

2017-05-29 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: So I do not think this is not limited to "new file". Anything that a tree-level three-way merge would resolve cleanly without having to consult the content-l

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-28 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: However given the discussion about an unborn HEAD, the option here would be to also pass the NULL sha for the symref and then add the annotation 'HEAD' after an extra \0

Re: Missing: Consistency of clean state output of "git add -i"

2017-05-28 Thread Philip Oakley
From: "Kaartic Sivaraam" I guess I'll take back my note in the previous email that says, I could help. I saw the implementation and found that I couldn't help as I don't have experience with PERL. My bad. I wouldn't let that stop you. We were all ignorant once.

Re: mergetool: what to do about deleting precious files?

2017-05-28 Thread Philip Oakley
From: "Junio C Hamano" <gits...@pobox.com> "Philip Oakley" <philipoak...@iee.org> writes: The git book [1] and a few blog posts [2] show how to preserve files which are in the current branch against changes that are on the branch being merged in. e.

mergetool: what to do about deleting precious files?

2017-05-27 Thread Philip Oakley
The git book [1] and a few blog posts [2] show how to preserve files which are in the current branch against changes that are on the branch being merged in. e.g. (from [2]) echo ' merge=ours' >> .gitattributes && # commit git config --global merge.ours.driver true (test) $ git checkout demo

Re: [PATCH 1/1] diff.c: color moved lines differently

2017-05-27 Thread Philip Oakley
a couple of mispellings in the doc parts: s/on location/one location/ [code not checked] - Original Message - From: "Stefan Beller" Subject: [PATCH 1/1] diff.c: color moved lines differently When a patch consists mostly of moving blocks of code around, it can be

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-26 Thread Philip Oakley
adding and updating an example.. From: "Philip Oakley" <philipoak...@iee.org> been trying to keep up... From: "Jeff King" <p...@peff.net> On Thu, May 25, 2017 at 11:59:24AM -0400, Jeff King wrote: The just-HEAD case could look like: This patch does wor

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-26 Thread Philip Oakley
been trying to keep up... From: "Jeff King" On Thu, May 25, 2017 at 11:59:24AM -0400, Jeff King wrote: The just-HEAD case could look like: This patch does work, in the sense that upload-pack advertises the unborn HEAD symref. But the client doesn't actually do anything with

Re: [PATCH 01/15] handle_revision_arg: reset "dotdot" consistently

2017-05-23 Thread Philip Oakley
From: "Jeff King" <p...@peff.net> On Sat, May 20, 2017 at 03:56:32PM +0100, Philip Oakley wrote: > That means we do report the correct name for "a" in the > pending array. But some code paths try to show the whole > "a..b" name in error messages,

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

2017-05-23 Thread Philip Oakley
From: "Junio C Hamano" Félix Saparelli writes: I created a git repository that, for joke reasons, has a single branch called MASTER (in uppercase). Upon cloning this repo, git attempts to checkout the master branch (in lowercase), which does not exist.

Re: [PATCH 01/15] handle_revision_arg: reset "dotdot" consistently

2017-05-20 Thread Philip Oakley
From: "Jeff King" When we are parsing a range like "a..b", we write a temporary NUL over the first ".", so that we can access the names "a" and "b" as C strings. But our restoration of the original "." is done at inconsistent times, which can lead to confusing results. For most

Re: [PATCH] pull: optionally rebase submodules

2017-05-11 Thread Philip Oakley
From: "Brandon Williams" Teach pull to optionally update submodules when '--recurse-submodules' is provided. This will teach pull to run 'submodule update --rebase' when the '--recurse-submodules' and '--rebase' flags are given. Signed-off-by: Brandon Williams

  1   2   3   4   5   6   7   8   9   10   >