Re: [RFC/PATCH 0/2] Test the Git version string

2013-04-14 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: If the parsing is done for white/blacklist purposes, is there a need to straight-jacket the verison string format like this series? The purpose is to document what we felt we could guarantee, and that which was open to variation, so that those, like

Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: If you have a cover-letter configuration set to anything other than 'false', 'git format-patch' might generate a cover letter, and 'git am' doesn't seem to like that. Ideally 'git am' should skip the cover-letter, but for now lets just fix

Re: Ensimag students projects, version 2013

2013-04-14 Thread Ping Yin
15 git rebase --stash, git pull --rebase --stash It seems that Ramkumar Ramachandra is working on this in his [PATCH v2 0/3] Introduce pull.autostash series Ping Yin On Mon, Apr 15, 2013 at 4:04 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Hi, Like the years before, I'm going to

Re: [PATCH v2] branch: colour upstream branches

2013-04-14 Thread Felipe Contreras
On Sun, Apr 14, 2013 at 8:52 PM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: On Sun, Apr 14, 2013 at 06:38:27PM -0500, Felipe Contreras wrote: +if (want_color(branch_use_color)) +snprintf(fancy, sizeof(fancy), %s%s%s, +

[PATCH v3] branch: colour upstream branches

2013-04-14 Thread Felipe Contreras
Otherwise when using 'git branch -vv' it's hard to see them among so much output. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- This time with strbuf. Documentation/config.txt | 3 ++- builtin/branch.c | 38 ++ 2 files changed, 32

Re: [RFC/PATCH] clone: introduce clone.submoduleGitDir to relocate $GITDIR

2013-04-14 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: If the envisioned use of this is to use it as a building block of something else that is user-facing (e.g. the user says git add, and before the command finishes, somewhere we internally run git clone), then would it be possible that you are better off

Re: [PATCH] rebase-am: fix regression with new cover-letter config

2013-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: You are mean to say fix regression, which gave me a small heart attack ;-). I was worried if we had already merged it to 'next'. As I already wrote in the recent What's cooking, the series looks good to me. I am inclined to say that we

Re: [PATCH v3] branch: colour upstream branches

2013-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Otherwise when using 'git branch -vv' it's hard to see them among so much output. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- This time with strbuf. Documentation/config.txt | 3 ++- builtin/branch.c | 38

Re: [RFC/PATCH] push: introduce implicit push

2013-04-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: ... In my proposal, the precedence order branch.name.pushremote, remote.pushdefault, branch.name.remote, remote.default, origin, remains the same: we just want to change which branch that name refers to. That changing the meaning of name in

Re: [PATCH] bisect: Store first bad commit as comment in log file

2013-04-14 Thread Christian Couder
From: Torstein Hegge he...@resisty.net Subject: [PATCH] bisect: Store first bad commit as comment in log file Date: Sat, 13 Apr 2013 17:22:57 +0200 When bisect successfully finds a single revision, the first bad commit should be shown to human readers of 'git bisect log'. This resolves the

Re: State of CVS-to-git conversion tools (Was: Re: cvsps: bad usage: invalid argument --norc)

2013-04-14 Thread Michael Haggerty
On 04/14/2013 01:33 PM, Eric S. Raymond wrote: [...] I wish I could point you at a convertor I really trust. I can't. There is a third tool, cvs2git (based on the analyzer from cvs2svn) that I don't maintain, which has problems of its own.

Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

2013-04-14 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, executing a 'git pull' on a dirty worktree gives the following annoying message: s/annoying//; In general, avoid forcing your value judgement to readers when you do not have to. Instead, you can just highlight the source of your

<    1   2