On Fri, Feb 20, 2015 at 11:13:47PM -0800, Junio C Hamano wrote:
> >>OPT_BOOL(0, "dissociate", &option_dissociate,
> >> N_("use --reference only while cloning")),
> >> + OPT_BOOL(0, "disassociate", &option_dissociate,
> >> + N_("use --reference only while cloning")),
> >
Jeff King writes:
> On Fri, Feb 20, 2015 at 11:10:22AM -0800, Matt Whiteley wrote:
>
>> diff --git a/builtin/clone.c b/builtin/clone.c
>> index 316c75d..7e193ae 100644
>> --- a/builtin/clone.c
>> +++ b/builtin/clone.c
>> @@ -97,6 +97,8 @@ static struct option builtin_clone_options[] = {
>>
Jeff King writes:
> On Fri, Feb 20, 2015 at 03:06:39PM -0800, Junio C Hamano wrote:
>
>> -- >8 --
>> Subject: config.txt: spell out how certain typed values are written
>>
>> Many variables have values that are not arbitrary strings and there
>> are ways to spell these values of certain types.
On Fri, Feb 20, 2015 at 11:10:22AM -0800, Matt Whiteley wrote:
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 316c75d..7e193ae 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -97,6 +97,8 @@ static struct option builtin_clone_options[] = {
> N_("clone only on
On Fri, Feb 20, 2015 at 03:06:39PM -0800, Junio C Hamano wrote:
> -- >8 --
> Subject: config.txt: spell out how certain typed values are written
>
> Many variables have values that are not arbitrary strings and there
> are ways to spell these values of certain types. The way to spell
> colors wa
Stefan Beller writes:
> On Wed, Feb 18, 2015 at 6:54 PM, Junio C Hamano wrote:
>> On Wed, Feb 18, 2015 at 4:43 PM, Shawn Pearce wrote:
>>>
>>> This fails from a JGit server because the ref advertisement for an
>>> empty repository differs and disagrees with the format used by
>>> git-core. The
Junio C Hamano writes:
> You can define values to optional negatives and optional positives to
> express a more
> elaborate sort order e.g.
>
> 1.0-pre12 < 1.0-rc0 < 1.0 < 1.0-post1
>
> even though "-post" does not have to be declared as optional positive.
... that is, you say "-pre" is a more
Thanks Junio for the prompt reply! :) Yes, that's exactly how i would like
things to be. I'll definitely try to push this thing and see if this flow
can be implemented.
However, can you please guide me whether there's any way i could have
figured out about the git reset command that the developer
On Fri, Feb 20, 2015 at 7:33 PM, Duy Nguyen wrote:
> On Sat, Feb 21, 2015 at 10:25 AM, Junio C Hamano wrote:
>> On Fri, Feb 20, 2015 at 7:02 PM, Duy Nguyen wrote:
>>>
>>> My idea is to make it easy for the user to change the sort algorithm.
>>> And it's probably intuitive to just substitute a st
On Fri, Feb 20, 2015 at 8:46 PM, Technext wrote:
> The biggest problem that I see here is that
> every developer has the rights to commit, which I feel is not right.
Hmm, if you have some way to classify developers into two (or more?)
categories, what would you do instead? Allow some to commit, a
I came across a problem recently. One of the developers committed some
changes in a branch. When he checked the branch log (git checkout branch;
git log), the commit (say, abc) was showing up but when he checked the log
for a file (git log ), which was part of the given commit (abc),
the associated
On Fri, Feb 20, 2015 at 7:42 AM, David Turner wrote:
> On Fri, 2015-02-20 at 06:38 +0700, Duy Nguyen wrote:
>> >* 'git push'?
>>
>> This one is not affected by how deep your repo's history is, or how
>> wide your tree is, so should be quick..
>>
>> Ah the number of refs may affect both git-pus
On Fri, Feb 20, 2015 at 7:09 PM, Ævar Arnfjörð Bjarmason
wrote:
>>> But actually most of "git fetch" is spent in the reachability check
>>> subsequently done by "git-rev-list" which takes several seconds. I
>>
>> I wonder if reachability bitmap could help here..
>
> I could have sworn I had that e
On Sat, Feb 21, 2015 at 10:25 AM, Junio C Hamano wrote:
> On Fri, Feb 20, 2015 at 7:02 PM, Duy Nguyen wrote:
>>
>> My idea is to make it easy for the user to change the sort algorithm.
>> And it's probably intuitive to just substitute a string with
>> something. So if "1-rc1" is put incorrectly b
On Fri, Feb 20, 2015 at 7:02 PM, Duy Nguyen wrote:
>
> My idea is to make it easy for the user to change the sort algorithm.
> And it's probably intuitive to just substitute a string with
> something. So if "1-rc1" is put incorrectly before "1.1" and you
> realize that "1.999" ought to be the last
On Fri, Feb 20, 2015 at 12:26:29AM -0800, Junio C Hamano wrote:
> On Thu, Feb 19, 2015 at 11:13 PM, Jeff King wrote:
>
> >> There is debian bug 777690 [1] that's basically about making tag's
> >> version sort aware about -rc, -pre suffixes. I imagine it would touch
> >> versioncmp.c and builtin/t
On Fri, Feb 20, 2015 at 04:48:44AM -0500, Jeff King wrote:
> > From your list, it seems we can target 1 or 2 slots. I'd say it's still
> > worth applying, but if we don't find more mentors then perhaps it would
> > make sense to say so explicitely in
> > http://git.github.io/SoC-2015-Ideas.html so
On Fri, 2015-02-20 at 13:37 -0700, Martin Fick wrote:
> On Friday, February 20, 2015 01:29:12 PM David Turner wrote:
> >...
> > For a more general solution, perhaps a log of ref updates
> > could be used. Every time a ref is updated on the server,
> > that ref would be written into an append-only l
Michal Sojka writes:
> This patch fixes all these problems. Now, submodule.$name.update is
> fully documented in git-submodule.txt and the other files just refer to
"Fix all these problems by documenting submodule.*.update in
git-submodule.txt and make everybody else refer to it" in imperative
m
On Fri, Feb 20, 2015 at 5:06 AM, Matthieu Moy
wrote:
> Jeff King writes:
>> I think these might be getting a little larger than "micro".
>
> The ~/.git-credential-cache may be a bit harder, but the case of
> ~/.git-credentials should follow the same pattern as files for which
> this is already do
Jeff King writes:
> I'd agree it is worth a mention in the log (and possibly release notes),
> but I don't think it is worth polluting the documentation forever
> (though explaining that we never inherit might be worth doing, and that
> is perhaps what you meant).
Yes, I do not know how well the
On Fri, Feb 20, 2015 at 11:08:55PM +0100, Sebastian Schuberth wrote:
On 20.02.2015 01:03, brian m. carlson wrote:
If you want good performance, I'd recommend the latest version of Git
both client- and server-side. Newer versions of Git provide pack
bitmaps, which can dramatically speed up clon
On Feb 20, 2015, at 12:01, sojourner wrote:
What's the difference between this installer and the other one? Why
is this installer going to work?
See the website for a description. It was built to work with 10.4.8
or later. It was built using Apple's older GCC specifically to be
compatibl
Yi EungJun writes:
> I heard Git Contributors Summit is scheduled on April 8th at Git Merge 2015.
>
> Does anyone know the agenda of the summit? I am considering to attend the
> summit.
I am curious, too; the event is marked as invitation-only and I do
not know who decides the eligibility criter
On 2015-02-19 20.40, brian m. carlson wrote:
> On Thu, Feb 19, 2015 at 09:54:52AM -0800, Junio C Hamano wrote:
>> I can see that you do not agree with the "If we accept it" part
>> (where "it" refers to "allowing [...] was a bug.")---past acceptance
>> was not a bug for you.
Do we talk about the sa
On 20.02.2015 01:03, brian m. carlson wrote:
If you want good performance, I'd recommend the latest version of Git
both client- and server-side. Newer versions of Git provide pack
bitmaps, which can dramatically speed up clones and fetches, and Git
Do you happen now which version, if at all,
On 20.02.2015 15:25, Ævar Arnfjörð Bjarmason wrote:
tl;dr: After some more testing it turns out the performance issues we
have are almost entirely due to the number of refs. Some of these I
Interesting. We currently have similar performance issues when pushing
to a Git repo hosted on Gerrit.
On Fri, Feb 20, 2015 at 2:10 PM, Matt Whiteley wrote:
> I find the new --dissociate option for clone very helpful but I have a
> hard time with the spelling. It seems reasonable to have an alias since
> one exists for --recursive.
You may be undermining your own argument for inclusion of a new
--
Ævar Arnfjörð Bjarmason writes:
> I actually ran this a few times while testing it, so this is a before
> and after on a hot cache of linux.git with 406 tags v.s. ~140k. I ran
> the gc + repack + bitmaps for both repos noted in an earlier reply of
> mine, and took the fastest run out of 3:
>
>
David Turner writes:
> On Fri, 2015-02-20 at 06:38 +0700, Duy Nguyen wrote:
>> >* 'git push'?
>>
>> This one is not affected by how deep your repo's history is, or how
>> wide your tree is, so should be quick..
>>
>> Ah the number of refs may affect both git-push and git-pull. I think
>> St
On Friday, February 20, 2015 01:29:12 PM David Turner wrote:
>...
> For a more general solution, perhaps a log of ref updates
> could be used. Every time a ref is updated on the server,
> that ref would be written into an append-only log. Every
> time a client pulls, their pull data includes an in
Yeah, the neuroimaging site's info was unhelpful.
Does anybody have anything that's actually worked?
On 20 Feb 2015, at 11:35, Matthew Brett wrote:
> Hi,
>
> On Fri, Feb 20, 2015 at 2:38 AM, sojourner wrote:
>> Installed Git via installer. Updated path in .bash_profile. Get error
>> Illega
The variable was documented in git-mailinfo.txt, but not in config.txt.
The detailed documentation is still the one of --scissors in
git-mailinfo.txt, but we give enough information here to let the user
understand what it is about, and to make it easy to find it (e.g.
searching ">8" and "8<" finds
It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.
Signed-off-by: Matthieu Moy
---
Documentation/git-am.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f4eea28..0d8ba48
-Original Message-
On Feb 20, 2015 1:58AM Martin Fick wrote:
>On Feb 19, 2015 5:42 PM, David Turner wrote:
> > This one is not affected by how deep your repo's history is, or how
> > wide your tree is, so should be quick..
>Good to hear that others are starting to experiment with solutio
Fix long line splitting format while adding to builtin_clone_options.
Signed-off-by: Matt Whiteley
---
builtin/clone.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 7e193ae..fd6bcf4 100644
--- a/builtin/clone.c
+++ b/bu
Enable clone to accept alternate spelling for dissociate option. Add
alias to documentation following existing recursive/recurse-submodules
convention.
Signed-off-by: Matt Whiteley
---
Documentation/git-clone.txt | 3 ++-
builtin/clone.c | 2 ++
2 files changed, 4 insertions(+), 1 de
I find the new --dissociate option for clone very helpful but I have a
hard time with the spelling. It seems reasonable to have an alias since
one exists for --recursive.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More ma
On Feb 20, 2015, at 02:38, sojourner wrote:
Installed Git via installer. Updated path in .bash_profile. Get
error Illegal instruction: 4 when trying to run Git.
Built Git from source. Searches for the compiled source
unsuccessful. Which is nice: there's nothing to uninstall.
Searching onli
On Thu, 2015-02-19 at 23:57 -0700, Martin Fick wrote:
> On Feb 19, 2015 5:42 PM, David Turner wrote:
> >
> > On Fri, 2015-02-20 at 06:38 +0700, Duy Nguyen wrote:
> > > >* 'git push'?
> > >
> > > This one is not affected by how deep your repo's history is, or how
> > > wide your tree is, so
On Fri, Feb 20, 2015 at 11:06:44AM -0500, Stephen Morton wrote:
2. I'd not heard about bitmap indexes before this thread but it sounds
like they should help me. In limited searching I can't find much
useful documentation about them. It is also not clear to me if I have
to explicitly run "git repa
On Fri, Feb 20, 2015 at 5:29 AM, Matthieu Moy wrote:
> Subject: Documentation/config.txt: document mailinfo.scissor
>
> The variable was documented in git-mailinfo.txt, but not in config.txt.
> The detailed documentation is still the one of --scissors in
> git-mailinfo.txt, but we give enough info
Stephen Morton writes:
> 1. Ævar : I'm a bit concerned by your statement that git rebases take
> about 1-2 s per commit. Does that mean that a "git pull --rebase", if
> it is picking up say 120 commits (not at all unrealistic), could
> potentially take 4 minutes to complete? Or have I misinterpre
Hi,
On Fri, Feb 20, 2015 at 2:38 AM, sojourner wrote:
> Installed Git via installer. Updated path in .bash_profile. Get error Illegal
> instruction: 4 when trying to run Git.
I've seen the installer problem - suggestions here:
http://practical-neuroimaging.github.io/installation.html#if-you-are
This is fantastic. I really appreciate all the answers. And it's great
that I think I've sparked some general discussion that could lead
somewhere too.
Notes:
I'm currently using 2.1.3. I'll move to 2.3.x
I'm experimenting with git-annex to reduce repo size on disk. We'll see.
I could remove al
Hi,
I'm experiencing a problem with gitweb and some utf-8 bits like £ (the
pound sign) when showing diffs.
Example (Firefox's output):
XML Parsing Error: not well-formed Location:
https://hostname/gitweb?p=redacted.git;a=commitdiff;h=16ae27d6b030949772b298c6e2935a09c48169a7
Line Number 913, Colu
On Fri, Feb 20, 2015 at 1:09 PM, Ævar Arnfjörð Bjarmason
wrote:
> On Fri, Feb 20, 2015 at 1:04 AM, Duy Nguyen wrote:
>> On Fri, Feb 20, 2015 at 6:29 AM, Ævar Arnfjörð Bjarmason
>> wrote:
>>> Anecdotally I work on a repo at work (where I'm mostly "the Git guy")
>>> that's:
>>>
>>> * Around 500k
Yi EungJun writes:
> I heard Git Contributors Summit is scheduled on April 8th at Git Merge 2015.
>
> Does anyone know the agenda of the summit? I am considering to attend the
> summit.
It's all online now:
http://git-merge.com/
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubsc
Hello,
Very sorry if this has been explained before, I have been doing research past
few weeks in spare time and have not found a good answer yet on the safety of
doing something with git.
Basically we have some repos with huge history, namely FreeBSD source and
FreeBSD ports. In order to red
I heard Git Contributors Summit is scheduled on April 8th at Git Merge 2015.
Does anyone know the agenda of the summit? I am considering to attend the
summit.
--
View this message in context:
http://git.661346.n2.nabble.com/ANNOUNCE-Git-Merge-April-8-9-Paris-tp7624561p7625750.html
Sent from th
[just for chuckles, no flames please]
$ hg branch topic
Arbeitsverzeichnis wurde als Zweig topic markiert
(branches are permanent and global, did you want a bookmark?)
I have no idea since when hg cautions against using their version of
branches (embedded into the commits), but that line made me
On Fri, Feb 20, 2015 at 1:09 PM, Ævar Arnfjörð Bjarmason
wrote:
> On Fri, Feb 20, 2015 at 1:04 AM, Duy Nguyen wrote:
>> On Fri, Feb 20, 2015 at 6:29 AM, Ævar Arnfjörð Bjarmason
>> wrote:
>>> Anecdotally I work on a repo at work (where I'm mostly "the Git guy")
>>> that's:
>>>
>>> * Around 500k
On Fri, Feb 20, 2015 at 1:04 AM, Duy Nguyen wrote:
> On Fri, Feb 20, 2015 at 6:29 AM, Ævar Arnfjörð Bjarmason
> wrote:
>> Anecdotally I work on a repo at work (where I'm mostly "the Git guy") that's:
>>
>> * Around 500k commits
>> * Around 100k tags
>> * Around 5k branches
>> * Around 500 com
On Fri, 20 Feb 2015 05:49:21 -0500, Jeff King wrote:
> On Fri, Feb 20, 2015 at 11:36:27AM +0100, Michael J Gruber wrote:
>
> > > It's not quite so bad as you make out. We write the value to the
> > > GIT-BUILD-OPTIONS file during "make", no matter where it comes from, and
> > > load that in test
On Fri, Feb 20, 2015 at 11:36:27AM +0100, Michael J Gruber wrote:
> > It's not quite so bad as you make out. We write the value to the
> > GIT-BUILD-OPTIONS file during "make", no matter where it comes from, and
> > load that in test-lib.sh. So:
> >
> > make NO_ICONV=Nope
> > cd t
> > ./t39
"brian m. carlson" writes:
> On Tue, Feb 17, 2015 at 09:51:38AM +0100, Matthieu Moy wrote:
>> This should be fixable from Git itself, by replacing the calls to
>> "unlink" with something like
>>
>> int unlink_or_chmod(...) {
>> if (unlink(...)) {
>> chmod(...); // give user wri
Installed Git via installer. Updated path in .bash_profile. Get error Illegal
instruction: 4 when trying to run Git.
Built Git from source. Searches for the compiled source unsuccessful. Which is
nice: there's nothing to uninstall.
Searching online has a lot of suggestions and ideas. Anybody h
Jeff King venit, vidit, dixit 20.02.2015 02:48:
> On Thu, Feb 19, 2015 at 02:21:11PM +0100, Michael J Gruber wrote:
>
>>> It passes NO_ICONV through to the test suite, sets up a prerequisite,
>>> disables some test scripts which are purely about i18n (e.g.,
>>> t3900-i18n-commit), and marks some o
Dennis Kaarsemaker writes:
> given a config file name tells
> you where it should be, maybe in the resident kitchen-sink that is
> rev-parse:
It's actually a bit harder than this, since when both XDG and ~/.
exist, we read from both but write to one only. So there's not just one
answer to the qu
Signed-off-by: Matthieu Moy
---
SoC-2015-Microprojects.md | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/SoC-2015-Microprojects.md b/SoC-2015-Microprojects.md
index e49cb07..c6123bb 100644
--- a/SoC-2015-Microprojects.md
+++ b/SoC-2015-Microprojects.md
@@ -158,14 +158
Signed-off-by: Matthieu Moy
---
SoC-2015-Ideas.md | 45 -
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md
index a3e988e..4641800 100644
--- a/SoC-2015-Ideas.md
+++ b/SoC-2015-Ideas.md
@@ -34,7 +34,9 @@
Signed-off-by: Matthieu Moy
---
SoC-2015-Ideas.md | 27 +++
1 file changed, 27 insertions(+)
diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md
index 4641800..86de476 100644
--- a/SoC-2015-Ideas.md
+++ b/SoC-2015-Ideas.md
@@ -117,3 +117,30 @@ Cf. $gmane/213180 $gmane/2129
It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.
Signed-off-by: Matthieu Moy
---
Documentation/git-am.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index f4eea28..0d8ba48
The variable was documented in git-mailinfo.txt, but not in config.txt.
The detailed documentation is still the one of --scissors in
git-mailinfo.txt, but we give enough information here to let the user
understand what it is about, and to make it easy to find it (e.g.
searching ">8" and "8<" finds
On vr, 2015-02-20 at 11:06 +0100, Matthieu Moy wrote:
> The ~/.git-credential-cache may be a bit harder, but the case of
> ~/.git-credentials should follow the same pattern as files for which
> this is already done. So, doing it by mimicking existing code
> shouldn't
> be too hard.
>
> But maybe t
On Fri, Feb 20, 2015 at 11:09:07AM +0100, Matthieu Moy wrote:
> It was already documented, but the user had to follow the link to
> git-mailinfo.txt to find it.
>
> Signed-off-by: Matthieu Moy
> ---
> This one may be more controversial. I think it makes sense to apply
> it, but I won't fight for
On Fri, Feb 20, 2015 at 11:09:06AM +0100, Matthieu Moy wrote:
> The variale was documented in git-mailinfo.txt, but not in config.txt.
Missing 'b' in variable.
> +mailinfo.scissor::
s/scissor/&s/
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message t
Junio C Hamano venit, vidit, dixit 19.02.2015 19:10:
> Michael J Gruber writes:
>
>> Randall S. Becker venit, vidit, dixit 19.02.2015 14:32:
>>> git symbolic-ref --short HEAD
>>
>> That errors out when HEAD is detached.
>
> Isn't that what you would want to happen anyway?
>
> if current=$
The variale was documented in git-mailinfo.txt, but not in config.txt.
The detailed documentation is still the one of --scissors in
git-mailinfo.txt, but we give enough information here to let the user
understand what it is about, and to make it easy to find it (e.g.
searching ">8" and "8<" finds i
It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.
Signed-off-by: Matthieu Moy
---
This one may be more controversial. I think it makes sense to apply
it, but I won't fight for it if you think it adds too much noise to
the doc.
Documentation/git-am.tx
Jeff King writes:
>> * Be nicer to the user on tracked/untracked merge conflicts
>> [...]
>
> Sounds OK to me, though I agree the merging of untracked files is a
> little controversial.
Yes. To me, part of the project is to identify cases where this is
actually not controversial (OTOH, it's a bi
On Fri, Feb 20, 2015 at 10:39:42AM +0100, Matthieu Moy wrote:
> Jeff King writes:
>
> > - Matthieu, who also cited time constraints
>
> Just to clarify: last year we were co-mentoring with Ram. I ended up
> having a lot of time and did most of the work (not blaming Ram, and I
> enjoyed the ex
Jeff King writes:
> - Matthieu, who also cited time constraints
Just to clarify: last year we were co-mentoring with Ram. I ended up
having a lot of time and did most of the work (not blaming Ram, and I
enjoyed the experience). I'm still motivated to co-mentor, but this time
the co-mentoring h
On Thu, Feb 19, 2015 at 11:13 PM, Jeff King wrote:
>> There is debian bug 777690 [1] that's basically about making tag's
>> version sort aware about -rc, -pre suffixes. I imagine it would touch
>> versioncmp.c and builtin/tag.c (to retrieve the suffixes from config
>> file).
>>
>> [1] https://bug
Dear Invited Author,
Further to our previous communication, we would like to inform you that you can
upload your Invited Paper in our conferences in Vienna, Austria, March 15-17,
2015:
www.inase.org until the end of this week
Extended Versions of all the Invited papers will be promoted for dire
On Thu, Feb 19, 2015 at 3:13 AM, Julien Cretel wrote:
> On Wed, Feb 18, 2015 at 5:07 PM, Junio C Hamano wrote:
>
>> Julien's "HEAD=master, other" vs "HEAD, master, other" may be
>> subdued enough to be undistracting, I would guess. I do not think
>> the distinction between "HEAD = master" and "H
On Thu, Feb 19, 2015 at 11:29 PM, Jeff King wrote:
>
> This brings up an important issue. We cannot do GSoC without mentors. I
> had hoped that people populating the "ideas" list would volunteer to
> mentor for their projects.
>
> But so far the possibilities are:
>
> - Stefan
>
> - me, who ha
77 matches
Mail list logo