[PATCH v2] fetch: make --prune configurable

2013-07-13 Thread Michael Schubert
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: Junio C Hamano gits...@pobox.com Signed-off-by: Michael Schubert msc

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

2013-07-08 Thread Michael Schubert
a particular remote, add two new configuration variables fetch.prune and remote.name.prune: - fetch.prune allows to enable prune for all fetch operations. - remote.name.prune allows to change the behaviour per remote. Signed-off-by: Michael Schubert msc...@elegosoft.com --- http://thread.gmane.org

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 given branch. If the branch starts with 'refs

[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 msc...@elegosoft.com --- Documentation/git-p4.txt | 2

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

Re: Proposal: branch.name.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

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: ignore git-subtree executable

2012-12-22 Thread Michael Schubert
Signed-off-by: Michael Schubert msc...@elegosoft.com --- 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

[PATCH] git-subtree: fix typo in manpage

2012-12-22 Thread Michael Schubert
Signed-off-by: Michael Schubert msc...@elegosoft.com --- 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

[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 *

[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: Michael

[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-off-by: Michael Schubert msc