Re: [PATCH v2 03/11] tests: at-combinations: improve nonsense()

On Wed, May 8, 2013 at 12:55 AM, Junio C Hamano wrote: > Felipe Contreras writes: > >> In some circumstances 'git log' might fail, but not because the @ >> parsing failed. For example: 'git rev-parse' might succeed and return a >> bad object, and then 'git log' would fail. >> >> The layer we want

Re: [PATCH v2 02/11] tests: at-combinations: check ref names directly

On Wed, May 8, 2013 at 12:55 AM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Some committishes might point to the same commit, but through a >> different ref, that's why it's better to check directly for the ref, >> rather than the commit message. >> >> We can do that by calling rev-par

Re: [PATCH v2 00/11] sha1_name: improvements

Felipe Contreras writes: > When merging this series to the @ shortcut one, there will be > conflicts, this is how I propose fixing them: > > return len; /* syntax Ok, not enough switches */ > - if (0 < len && len == namelen) > + if (len > 0 && len == namelen) >

Re: [PATCH v2 03/11] tests: at-combinations: improve nonsense()

Felipe Contreras writes: > In some circumstances 'git log' might fail, but not because the @ > parsing failed. For example: 'git rev-parse' might succeed and return a > bad object, and then 'git log' would fail. > > The layer we want to test is revision parsing, so let's test that > directly. Hm

Re: [PATCH v2 02/11] tests: at-combinations: check ref names directly

Felipe Contreras writes: > Some committishes might point to the same commit, but through a > different ref, that's why it's better to check directly for the ref, > rather than the commit message. > > We can do that by calling rev-parse --symbolic-full-name, and to > differentiate the old from the

Re: [PATCH] remote-helpers: trivial cleanup

Felipe Contreras writes: > The comment was copied from hg-fast-export, not used anymore. > > Signed-off-by: Felipe Contreras > --- > contrib/remote-helpers/git-remote-bzr | 1 - > contrib/remote-helpers/git-remote-hg | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/contrib/remote-help

Re: 3 way merge during git p4 rebase is attempting to reapply past commits

On 08/05/13 00:12, Christopher Yee Mon wrote: Hello, I have a setup where I have a remote non-bare repo cloned from a perforce workspace. It is used as a remote repo that people clone into their own user repos, make commits to, then push back into the remote repo. Why is your p4 clone non-bare?

Re: [PATCH] remote-bzr: fix for disappeared revisions

Felipe Contreras writes: > On Tue, May 7, 2013 at 6:39 PM, Felipe Contreras > wrote: > >> + (cd gitrepo && >> + git fetch && >> + git log --format="%an %ad %s" --date=short origin/master > ../actual) && >> + >> + test_cmp actual expected > > Hmm: > > test_cmp expected actual Yeah, right. --

stdout versus stderr for cmd line git

I have been building some automated patching scripts to update multiple servers at once from our dev host. In doing so I ran into some oddities with linux command line GIT version 1.8.0-rc0, so a couple minor revisions behind. First, a "git pull" puts the list of branches updated onto stderr. The

Re: Please pull updates for Git 1.8.3 l10n round 2

Jiang Xin writes: > Hi Junio, > > The following changes since commit 7e6a0cc47da79dd22c0338aee8750fda92ced5d9: > > git-completion.bash: add remote.pushdefault to config list > (2013-04-29 09:57:47 -0700) > > are available in the git repository at: > > git://github.com/git-l10n/git-po master >

Re: Problems with Windows, Was: What's cooking in git.git (May 2013, #01; Fri, 3)

On 05/07/2013 10:27 AM, Torsten Bögershausen wrote: On 2013-05-04 01.14, Junio C Hamano wrote: Cygwin portability; both were reviewed by Jonathan, and the tip one seems to want a bit further explanation. Needs positive report from Cygwin 1.7 users who have been on 1.7 to make sure it doe

Re: [PATCH v6 4/7] git-clean: use a git-add-interactive compatible UI

2013/5/7 Junio C Hamano : > What is this message trying to achieve? "self review"??? > > A bit puzzled Maybe I should send a new rerolled patch series after this. Yesterday I wanted to wait for a while to see suggestions and reviews from others. -- Jiang Xin -- To unsubscribe from this list

Please pull updates for Git 1.8.3 l10n round 2

Hi Junio, The following changes since commit 7e6a0cc47da79dd22c0338aee8750fda92ced5d9: git-completion.bash: add remote.pushdefault to config list (2013-04-29 09:57:47 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to 4dcdc

[PATCH] remote-helpers: trivial cleanup

The comment was copied from hg-fast-export, not used anymore. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 1 - contrib/remote-helpers/git-remote-hg | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helper

Re: [PATCH] remote-bzr: fix for disappeared revisions

On Tue, May 7, 2013 at 6:39 PM, Felipe Contreras wrote: > + (cd gitrepo && > + git fetch && > + git log --format="%an %ad %s" --date=short origin/master > ../actual) && > + > + test_cmp actual expected Hmm: test_cmp expected actual -- Felipe Contreras -- To unsubscribe from this list: sen

[PATCH] remote-bzr: fix for disappeared revisions

It's possible that the previous tip goes away, we should not assume it's always present. Fortunately we are only using it to calculate the progress to display to the user, so only that needs to be fixed. Also, add a test that triggers this issue. Signed-off-by: Felipe Contreras --- contrib/remo

Re: [PATCH v2 1/3] fast-{import,export}: use get_sha1_hex() directly

Felipe Contreras writes: > Turns out most of the get_sha1() calls were correct; this does the trick: > > diff --git a/builtin/fast-export.c b/builtin/fast-export.c > index 18fdfb3..d1d68e9 100644 > --- a/builtin/fast-export.c > +++ b/builtin/fast-export.c > @@ -623,7 +623,7 @@ static void import_

3 way merge during git p4 rebase is attempting to reapply past commits

Hello, I have a setup where I have a remote non-bare repo cloned from a perforce workspace. It is used as a remote repo that people clone into their own user repos, make commits to, then push back into the remote repo. Then I periodically run the following commands in a script to push those change

Re: git p4 submit failing

I reset all the files to be lf. I also forced all the windows users IDEs to use Unix endings. I haven't seen that error since then Thanks for the assistance On Thu, Apr 18, 2013 at 7:43 PM, Pete Wyckoff wrote: > christopher.yee...@gmail.com wrote on Thu, 18 Apr 2013 11:24 -0500: >> The issue is

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

On Wed, May 8, 2013 at 12:06 AM, Junio C Hamano wrote: > Johan Herland writes: > >> ...oops, I see I forgot the trailing && on this line. Do you want a >> resend, or fix up yourself? > > I've pushed out a heavily fixed-up version on 'pu', mostly for > styles and some log message changes to descri

Re: [PATCH 2/7] t7900: Start testing usability of namespaced remote refs

Johan Herland writes: > That said, I could have a go at using "refs/peers/*" instead of > "refs/remotes/*", and see how that works out. Hmm, I had "refs/track/" in mind. Perhaps "peers" may work as well. > If it sticks, how pervasive do we want this renaming to be? I guess we > don't want to r

Re: [PATCH v2 1/3] fast-{import,export}: use get_sha1_hex() directly

On Tue, May 7, 2013 at 9:38 AM, Junio C Hamano wrote: > Felipe Contreras writes: > >> It's wrong to call get_sha1() if they should be SHA-1s, plus >> inefficient. >> >> Signed-off-by: Felipe Contreras >> --- > > It appears that "they should be SHA-1s" assumption does not hold; > this patch break

Re: [PATCH v2 00/11] sha1_name: improvements

On Tue, May 7, 2013 at 4:55 PM, Felipe Contreras wrote: > While trying to add support for the @ shortcut lots of cleanups arised. Here > they are in a single series. > > Felipe Contreras (7): > tests: at-combinations: simplify setup > tests: at-combinations: check ref names directly > tests:

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

Johan Herland writes: > ...oops, I see I forgot the trailing && on this line. Do you want a > resend, or fix up yourself? I've pushed out a heavily fixed-up version on 'pu', mostly for styles and some log message changes to describe "when it is not a symref". -- To unsubscribe from this list: se

[PATCH v4 1/2] sha1_name: refactor reinterpret()

This code essentially replaces part of ref with another ref, for example '@{-1}@{u}' is replaced with 'master@{u}', but this can be reused for other purposes other than nth prior checkouts. Signed-off-by: Felipe Contreras --- sha1_name.c | 42 +++--- 1 file ch

[PATCH v4 2/2] Add new @ shortcut for HEAD

Typing 'HEAD' is tedious, especially when we can use '@' instead. The reason for choosing '@' is that it follows naturally from the ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no operation, and when we don't have those, it makes sens to assume 'HEAD'. So now we can use 'git show @~1

[PATCH v4 0/2] New @ shortcut for HEAD

Hi, Same patches as before, except that the cleanup ones are in a different series, and this one doesn't depend on the other one. Felipe Contreras (2): sha1_name: refactor reinterpret() Add new @ shortcut for HEAD Documentation/git-check-ref-format.txt | 2 ++ Documentation/revisions.txt

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

On Tue, May 7, 2013 at 11:31 PM, Junio C Hamano wrote: > Johan Herland writes: >> On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano wrote: >>> It is interesting that this bug has stayed so long with us, which >>> may indicate that nobody actually uses the feature at all. >> >> I don't know if peopl

[PATCH v2 11/11] sha1_name: check @{-N} errors sooner

From: Ramkumar Ramachandra It's trivial to check for them in the @{N} parsing loop. [fc: style] Signed-off-by: Felipe Contreras --- sha1_name.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index c512c69..db965af 100644 --- a/sha1_name.

[PATCH v2 10/11] sha1_name: reorganize get_sha1_basic()

Through the years the functionality to handle @{-N} and @{u} has moved around the code, and as a result, code that once made sense, doesn't any more. There is no need to call this function recursively with the branch of @{-N} substituted because dwim_{ref,log} already replaces it. However, there'

[PATCH v2 09/11] sha1_name: don't waste cycles in the @-parsing loop

From: Ramkumar Ramachandra The @-parsing loop unnecessarily checks for the sequence "@{" from len - 2 unnecessarily. We can safely check from len - 4. [fc: remove cruft] Signed-off-by: Felipe Contreras --- sha1_name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha1_na

[PATCH v2 08/11] sha1_name: avoid Yoda conditions

Speak in reverse we shall not; compare variable with constant, not constant with variable. Signed-off-by: Felipe Contreras --- sha1_name.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6530ddd..93c4e8c 100644 --- a/sha1_name.c +++ b/sha1_

[PATCH v2 07/11] sha1_name: remove unnecessary braces

Signed-off-by: Felipe Contreras --- sha1_name.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 01e49a9..6530ddd 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -465,12 +465,11 @@ static int get_sha1_basic(const char *str, int len, unsigned

[PATCH v2 06/11] sha1_name: remove no-op

'at' is always 0, since we can reach this point only if !len && reflog_len, and len=at when reflog is assigned. Signed-off-by: Felipe Contreras --- sha1_name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha1_name.c b/sha1_name.c index 3820f28..01e49a9 100644 --- a/sha1_n

[PATCH v2 04/11] tests: at-combinations: increase coverage

From: Ramkumar Ramachandra Add more tests exercising documented functionality. [fc: commit message and extra tests] Signed-off-by: Ramkumar Ramachandra Signed-off-by: Felipe Contreras --- t/t1508-at-combinations.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t1508-at-combin

[PATCH v2 05/11] tests: at-combinations: @{N} versus HEAD@{N}

From: Ramkumar Ramachandra All the tests so far check that @{N} is the same as HEAD@{N} (for positive N). However, this is not always the case; write a couple of tests for this. [fc: simplify some wording] Signed-off-by: Ramkumar Ramachandra Signed-off-by: Felipe Contreras --- t/t1508-at-com

[PATCH v2 03/11] tests: at-combinations: improve nonsense()

In some circumstances 'git log' might fail, but not because the @ parsing failed. For example: 'git rev-parse' might succeed and return a bad object, and then 'git log' would fail. The layer we want to test is revision parsing, so let's test that directly. Signed-off-by: Ramkumar Ramachandra Sig

[PATCH v2 01/11] tests: at-combinations: simplify setup

The test is setting up an upstream branch, but there's a much simpler way of doing that: git branch -u. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Felipe Contreras --- t/t1508-at-combinations.sh | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/t/t1508-at-combina

[PATCH v2 02/11] tests: at-combinations: check ref names directly

Some committishes might point to the same commit, but through a different ref, that's why it's better to check directly for the ref, rather than the commit message. We can do that by calling rev-parse --symbolic-full-name, and to differentiate the old from the new behavior we add an extra argument

[PATCH v2 00/11] sha1_name: improvements

Hi, While trying to add support for the @ shortcut lots of cleanups arised. Here they are in a single series. Felipe Contreras (7): tests: at-combinations: simplify setup tests: at-combinations: check ref names directly tests: at-combinations: improve nonsense() sha1_name: remove no-op

Re: [PATCH 2/7] t7900: Start testing usability of namespaced remote refs

On Tue, May 7, 2013 at 3:29 AM, Junio C Hamano wrote: > Johan Herland writes: >> +test_expect_success 'work-around "clone" with namespaced remote refs' ' >> + rm -rf client && >> + git init client && >> + ( >> + cd client && >> + git remote add origin ../server

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

Johan Herland writes: > On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano wrote: >> Johan Herland writes: >> >>> ... there is AFAICS _no_ way for sscanf() - having >>> already done one or more format extractions - to indicate to its caller >>> that the input fails to match the trailing part of the

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

Johan Herland writes: > New version coming up. I'm going to rip this patch out of the > surrounding series, since it doesn't really belong there anyway. Thanks; will queue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mor

Re: Add porcelain command to revert a single staged file to its HEAD state while preserving its staged state

Junio C Hamano wrote: > Dimitar Bonev writes: > > [administrivia: please do not drop people out of Cc list] > > That invites another question: if it is very well related, why isn't > it an option to start from the state you have in the working tree > (i.e. doing nothing), or in the index (i.e. "g

Re: [PATCH] deprecate core.statinfo at Git 2.0 boundary

This looks ok with me, though I can manage without backward compatibility. -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (May 2013, #02; Mon, 6)

On Tue, May 7, 2013 at 1:59 AM, Junio C Hamano wrote: > * fc/at-head (2013-05-02) 5 commits > - Add new @ shortcut for HEAD > - sha1_name: refactor reinterpret() > - sha1_name: compare variable with constant, not constant with variable > - sha1_name: remove unnecessary braces > - sha1_name:

Re: [PATCH] gitk: add support for -G'regex' pickaxe variant

On Tue, May 7, 2013 at 12:17 PM, Martin Langhoff wrote: > I just did git rebase origin/master for the umpteenth time, which > reminded me this nice patch is still pending. > > ping? For some reason getting patches into gitk takes a long long looong time. -- Felipe Contreras -- To unsubscribe fr

[PATCHv2 3/3] shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin

When expanding shorthand refs to full ref names (e.g. in dwim_ref()), we use the ref_rev_parse_rules list of expansion patterns. This list allows "origin" to be expanded into "refs/remotes/origin/HEAD", by using the "refs/remotes/%.*s/HEAD" pattern from that list. shorten_unambiguous_ref() exists

[PATCHv2 2/3] t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"

There is currently a bug in refs.c:shorten_unambiguous_ref() that causes "refs/remotes/origin/HEAD" to be shortened to "origin/HEAD" instead of "origin" (which is expected from matching against the "refs/remotes/%.*s" pattern from refs.c:ref_rev_parse_rules). Signed-off-by: Johan Herland --- t/t

[PATCHv2 1/3] t1514: Add tests of shortening refnames in strict/loose mode

These tests verify the correct behavior of "git rev-parse --abbrev-ref" in both "strict" and "loose" modes. Really, it tests the correct behavior of refs.c:shorten_unambiguous_ref() with its 'strict' argument set to either true of false. Signed-off-by: Johan Herland --- t/t1514-rev-parse-shorten

Re: [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin

On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano wrote: > Johan Herland writes: > >> ... there is AFAICS _no_ way for sscanf() - having >> already done one or more format extractions - to indicate to its caller >> that the input fails to match the trailing part of the format string. > > Yeah, we ca

Re: jn/config-ignore-inaccessible (Re: What's cooking in git.git (Apr 2013, #10; Mon, 29))

On Sat, May 04, 2013 at 08:55:39PM -0700, Junio C Hamano wrote: > >> http://colabti.org/irclogger/irclogger_log/git?date=2013-05-03#l3022 > >> http://colabti.org/irclogger/irclogger_log/git?date=2013-05-03#l3111 > > > > I think the approach taken in the patch above is a good one. If > > /etc/

Re: [PATCH v2] remove the impression of unexpectedness when access is denied

On Mon, May 06, 2013 at 07:02:41AM -0700, Junio C Hamano wrote: > >Would it make sense for the server to send an "ERR" packet to give > >a more helpful diagnosis? > > I think git-daemon does so (or at least attempts to do so); > path_ok() uses enter_repo() to check if the given path is a

Re: [PATCH] CodingGuidelines: make it clear which files in Documentation are the sources

wor...@ariadne.com (Dale R. Worley) writes: > It's also a test for submitting a patch. Then, the next step is to read SubmittingPatches (the part about how to format your email and the role of the ---, and the part about signed-off-by) ;-). Welcome aboard! -- Matthieu Moy http://www-verimag.im

[PATCH] CodingGuidelines: make it clear which files in Documentation are the sources

While learning about making a documentation patch, I noticed that Documentation/CodingGuideles isn't as clear as it could be regarding how to edit the documentation. In particular, it says "Most (if not all) of the documentation pages are written in AsciiDoc - and processed into HTML output and ma

Re: [PATCH] gitk: add support for -G'regex' pickaxe variant

I just did git rebase origin/master for the umpteenth time, which reminded me this nice patch is still pending. ping? m On Thu, Jun 14, 2012 at 2:34 PM, Zbigniew Jędrzejewski-Szmek wrote: > From: Martin Langhoff > > git log -G'regex' is a very usable alternative to the classic > pickaxe. Min

Re: [PATCH v2] clone: allow cloning local paths with colons in them

On Tue, May 07, 2013 at 08:34:51AM -0700, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > > diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh > > index 67869b4..0629149 100755 > > --- a/t/t5601-clone.sh > > +++ b/t/t5601-clone.sh > > @@ -280,4 +280,9 @@ test_expect_success 'clone checkin

Re: [PATCH v3 3/9] t6111: new TREESAME test set

Kevin Bracey writes: > On 06/05/2013 23:36, Junio C Hamano wrote: >> Kevin Bracey writes: >> >>> +#,---E--. *H--. * marks !TREESAME parent >>> paths >>> +# /\ / \* >>> +# *A--*B---D--*F-*G-K-*L-*M >>> +# \ /* \ /

Re: [PATCH] get_sha1: improve ambiguity warning regarding SHA-1 and ref names

Nguyễn Thái Ngọc Duy writes: > > That's an important feature for safety. When a script has created an > > object or learned about it some other way, as long as it doesn't > > abbreviate its name it can be sure that git commands will not > > misunderstand it. > > > > So I think this is a ba

Re: [PATCH v3 2/4] fetch-pack: prepare updated shallow file before fetching the pack

Nguyễn Thái Ngọc Duy writes: > index-pack --strict looks up and follows parent commits. If shallow > information is not ready by the time index-pack is run, index-pack may > be lead to non-existent objects. Make fetch-pack save shallow file to > disk before invoking index-pack. > > git learns ne

Re: [PATCH v3 10/9] revision.c: treat A...B merge bases as if manually specified

On 07/05/2013 00:24, Junio C Hamano wrote: Kevin Bracey writes: The documentation assures users that "A...B" is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. This isn't in fact quite true, because the calculated merge bases are not sent to add_rev_cmdline(). We want the commands to

Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config

Junio C Hamano writes: > I have a mildly strong suspicion that a better approach might be to: > > - Copy the current stable snapshot to the contrib/ area, [...] > > - Keep the development at your GitHub repository, [...] > > - Update what is in contrib/ in my tree with a stable snapshot, >

Re: [PATCH v2] clone: allow cloning local paths with colons in them

Nguyễn Thái Ngọc Duy writes: > diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh > index 67869b4..0629149 100755 > --- a/t/t5601-clone.sh > +++ b/t/t5601-clone.sh > @@ -280,4 +280,9 @@ test_expect_success 'clone checking out a tag' ' > test_cmp fetch.expected fetch.actual > ' > > +test_ex

Re: [PATCH v3 3/9] t6111: new TREESAME test set

On 06/05/2013 23:36, Junio C Hamano wrote: Kevin Bracey writes: +#,---E--. *H--. * marks !TREESAME parent paths +# /\ / \* +# *A--*B---D--*F-*G-K-*L-*M +# \ /* \ / +#`-C-' `-*I-*J +# +# A creates "fi

Re: [PATCH v6 4/7] git-clean: use a git-add-interactive compatible UI

Jiang Xin writes: > 2013/5/7 Jiang Xin : >> Rewrite menu using a new method `list_and_choose`, which is borrowed >> from `git-add--interactive.perl`. We can reused this method later for >> more actions. >> >> Please NOTE: >> >> * Method `list_and_choose` return an array of integers, and >> * it

Re: [PATCH v3 5/9] revision.c: Make --full-history consider more merges

Kevin Bracey writes: > On 06/05/2013 23:45, Junio C Hamano wrote: >> Kevin Bracey writes: >> >>> +struct treesame_state { >>> + unsigned int nparents; >>> + unsigned char treesame[FLEX_ARRAY]; >>> +}; >> I have been wondering if we want to do one-bit (not one-byte) per >> parent but no biggi

Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config

Michael Haggerty writes: > My understanding is that we are waiting on two things: > > 1. Consensus from the community. I would characterize the feedback on > the mailing list as limited in quantity but strongly positive [1-4] and > I think that most/all of the wishes for post-receive-email featu

Re: [PATCH v3 5/9] revision.c: Make --full-history consider more merges

On 06/05/2013 23:45, Junio C Hamano wrote: Kevin Bracey writes: +struct treesame_state { + unsigned int nparents; + unsigned char treesame[FLEX_ARRAY]; +}; I have been wondering if we want to do one-bit (not one-byte) per parent but no biggie ;-) I did start down that path, beca

Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config

Matthieu Moy writes: > OTOH, it's not urgent, people can already use git-multimail by taking it > from GitHub. Yes. There are less and less reason to rush things into contrib/ these days, which is a very good thing from ecosystem's point of view. It is a sign that Git has matured that my tree

Re: [PATCH v2 1/3] fast-{import,export}: use get_sha1_hex() directly

Felipe Contreras writes: > It's wrong to call get_sha1() if they should be SHA-1s, plus > inefficient. > > Signed-off-by: Felipe Contreras > --- It appears that "they should be SHA-1s" assumption does not hold; this patch breaks at least 3303, 9020, and 9300. Also assuming these are always 40-

Re: offtopic: ppg design decisions - encapsulation

On Mon, May 6, 2013 at 11:53 AM, John Keeping wrote: > I'm not sure I fully understand what the reports are, but it sounds like > they are closely related to original configuration commits. If that is > the case, have you considered using Git notes instead of a separate > repository? Interesting

Re: Pitfalls in auto-fast-forwarding heads that are not checked out?

On Sat, May 4, 2013 at 2:51 PM, Jonathan Nieder wrote: > Another trick is to use "git push": > git push . $production_sha1:refs/heads/master Great trick -- thanks! In use in ppg now :-) m -- martin.langh...@gmail.com - ask interesting questions - don't get distracted with shiny stu

Problems with Windows, Was: What's cooking in git.git (May 2013, #01; Fri, 3)

On 2013-05-04 01.14, Junio C Hamano wrote: > > Cygwin portability; both were reviewed by Jonathan, and the tip one > seems to want a bit further explanation. Needs positive report > from Cygwin 1.7 users who have been on 1.7 to make sure it does not > regress for them. I was trying to verify

Re: [PATCH 0/4] fix packed-refs races

On Mon, May 06, 2013 at 11:40:47PM -0700, Junio C Hamano wrote: > I queued this, and will push the result out on the side of 'pu' > closer to 'next'. Could you double check the conflict resolution? I eyeballed the "--cc" output, as well as the resulting file, and it looks fine to me. > I haven't

Re: [PATCH] deprecate core.statinfo at Git 2.0 boundary

On Mon, May 06, 2013 at 10:31:10PM -0700, Junio C Hamano wrote: > c08e4d5b5cfa (Enable minimal stat checking, 2013-01-22) advertised > the configuration variable core.checkstat in the documentation and > its log message, but the code expected core.statinfo instead. > > For now, add core.checkstat

Re: another packed-refs race

On 05/07/2013 06:44 AM, Jeff King wrote: > On Tue, May 07, 2013 at 06:32:12AM +0200, Michael Haggerty wrote: > >> Another potential problem caused by the non-atomicity of loose reference >> reading could be to confuse reachability tests if process 1 is reading >> loose references while process 2 i

Re: Fwd: Uninit'ed submodules

On 07/05/13 07:16, Jens Lehmann wrote: > Am 06.05.2013 02:19, schrieb Chris Packham: >> This did get me thinking. Why does an uninitialized submodule need to >> have an empty directory? If it didn't the maintainer in question >> probably would have realized that he needed to run "git submodule >> u

Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config

Junio C Hamano writes: > Matthieu Moy writes: > >> More precisely: you should have a look at git-multimail (in directory >> contrib/, in branch for now pu/, or from >> https://github.com/mhagger/git-multimail) before spending time on >> post-receive-email. > > Oh, by the way, is this a vote of c

Re: [PATCH] contrib/hooks/post-receive-email: get description from repo.git/config

On 05/07/2013 08:36 AM, Junio C Hamano wrote: > Matthieu Moy writes: > >> More precisely: you should have a look at git-multimail (in directory >> contrib/, in branch for now pu/, or from >> https://github.com/mhagger/git-multimail) before spending time on >> post-receive-email. > > Oh, by the w

Re: [PATCH 4/4] fast-import: only store commit objects

On 05/07/2013 09:12 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> CVS stores all of the revisions of a single file in a single filename,v >> file in rcsfile(5) format. The revisions are stored as deltas ordered >> so that a single revision can be reconstructed from a sing

An individual Learn how to Help make pandora sale?

* pandora uk * produce a great reward, any trend headline, plus a pleasurable for the vision inclusion in your assortment. Pandora drops enjoy specific activities and also situations simply by developing any Pandora diamond jewelry drops. They will can be

Re: [PATCH 4/4] fast-import: only store commit objects

Michael Haggerty writes: > CVS stores all of the revisions of a single file in a single filename,v > file in rcsfile(5) format. The revisions are stored as deltas ordered > so that a single revision can be reconstructed from a single serial read > of the file. > > cvs2git

Re: [PATCH 4/4] fast-import: only store commit objects

On Tue, May 7, 2013 at 1:47 AM, Michael Haggerty wrote: > On 05/07/2013 06:47 AM, Felipe Contreras wrote: >> On Mon, May 6, 2013 at 10:27 PM, Michael Haggerty >> wrote: >> >>> You conjectured earlier that nobody uses blob marks, and I provided a >>> counterexample. Then you proposed a workaroun

What's cooking in git.git (May 2013, #02; Mon, 6)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. As we already have merged enough changes to 'master' during this cycle that can potentially cause unforseen regressions, let's not merge topics