Re: Remote's 'currently active branch' not HEAD?

2013-09-03 Thread Michael Schubert
On Tue, Sep 03, 2013 at 02:37:33PM +0200, Andreas Krey wrote: > On Tue, 03 Sep 2013 13:48:31 +, Andreas Krey wrote: > ... > > I now have a sample repo that reproduces this behaviour. > > Unpack tar file, clone, see clone having 'wrong' branch > > checked out, apparently independent of the trans

[PATCH v2] fetch: make --prune configurable

2013-07-13 Thread Michael Schubert
ne option from the command line will override the configured default. Since --prune is a potentially destructive operation (Git doesn't keep reflogs for deleted references yet), we don't want to prune without users consent, so this configuration will not be on by default. Helped-by: J

[RFC/PATCH] fetch: make --prune configurable

2013-07-08 Thread Michael Schubert
when fetching from a particular remote, add two new configuration variables "fetch.prune" and "remote..prune": - "fetch.prune" allows to enable prune for all fetch operations. - "remote..prune" allows to change the behaviour per remote. Signed-off-by: Micha

Re: [PATCH] Change "remote tracking" to "remote-tracking"

2013-07-04 Thread Michael Schubert
On Wed, Jul 03, 2013 at 11:38:51AM -0700, Jonathan Nieder wrote: > Michael Schubert wrote: > > > --- a/Documentation/git-p4.txt > > +++ b/Documentation/git-p4.txt > > @@ -180,7 +180,7 @@ subsequent 'sync' operations. > > Import changes into

[PATCH] Change "remote tracking" to "remote-tracking"

2013-07-03 Thread Michael Schubert
Fix a typo ("remote remote-tracking") going back to the big cleanup in 2010 (8b3f3f84 etc). Also, remove some more occurrences of "tracking" and "remote tracking" in favor of "remote-tracking". Signed-off-by: Michael Schubert --- Documentation/git-p4

Re: Google Summer of Code 2013 (GSoC13)

2013-02-20 Thread Michael Schubert
On 02/18/2013 06:42 PM, Jeff King wrote: > > I will do it again, if people feel strongly about Git being a part of > it. However, I have gotten a little soured on the GSoC experience. Not > because of anything Google has done; it's a good idea, and I think they > do a fine of administering the pro

Re: Proposal: branch..remotepush

2013-02-07 Thread Michael Schubert
On 02/07/2013 05:14 PM, Ramkumar Ramachandra wrote: > This has been annoying me for a really long time, but I never really > got around to scratching this particular itch. I have a very common > scenario where I fork a project on GitHub. I have two configured > remotes: origin which points to "g

Re: [PATCH] Verify Content-Type from smart HTTP servers

2013-02-06 Thread Michael Schubert
On 01/31/2013 11:09 PM, Junio C Hamano wrote: > > -static int http_request_reauth(const char *url, void *result, int target, > +static int http_request_reauth(const char *url, > +struct strbuf *type, > +void *result, int target, >

[PATCH] git-subtree: fix typo in manpage

2012-12-22 Thread Michael Schubert
Signed-off-by: Michael Schubert --- contrib/subtree/git-subtree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 0c44fda..c5bce41 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git

[PATCH] git-subtree: ignore git-subtree executable

2012-12-22 Thread Michael Schubert
Signed-off-by: Michael Schubert --- contrib/subtree/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 7e77c9d..91360a3 100644 --- a/contrib/subtree/.gitignore +++ b/contrib/subtree/.gitignore @@ -1,4 +1,5 @@ *~ +git

Re: [PATCH] test-generation: compute generation numbers and clock skews

2012-09-14 Thread Michael Schubert
main() is missing a return here: test-generation.c:105:1: warning: control reaches end of non-void function [-Wreturn-type] -- 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/majordo

[PATCH 2/2] symbolic-ref: check format of given refname

2012-07-16 Thread Michael Schubert
Currently, it's possible to update HEAD with a nonsense reference since no strict validation ist performed. Example: $ git symbolic-ref HEAD 'refs/heads/master > > > ' Fix this by checking the given reference with check_refname_format(). Signed-

[PATCH 1/2] refs: disallow ref components starting with hyphen

2012-07-16 Thread Michael Schubert
Currently, we allow refname components to start with a hyphen. There's no good reason to do so and it troubles the parseopt infrastructure. Explicitly refuse refname components starting with a hyphen inside check_refname_component(). Revert 63486240, which is obsolete now. Signed-off-by: Mi

[PATCH] refname format cleanup

2012-07-16 Thread Michael Schubert
Previous discussion: http://thread.gmane.org/gmane.comp.version-control.git/200129/focus=200146 I'm not sure if I've drawn the right conclusions from the previous thread, so please let me know in case that's the wrong way to go.. * refs: disallow ref components starting with hyphen * symbolic

[PATCH] Documentation/git-daemon: add missing word

2012-07-16 Thread Michael Schubert
Signed-off-by: Michael Schubert --- Documentation/git-daemon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 31b28fc..e8f7577 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt