Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-08 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: One possible sane behaviour of git rm $path might be: - If --force is given, remove it from the index and from the working tree (i.e. rm -rf $path), but use the gitfile facility to save $path/.git away to $GIT_DIR/modules/$name; error out

Problems pushing???

2012-07-08 Thread pbGit
Hi, I have installed git locally to my machine. It is running mac os lion. This is intended to be the remote machine too. I have followed, what I think is the correct way to do this, using http://www.petermac.com/setup-git-local-and-remote-repositories/ this . All seemed to be ok until I

The linux-input mailing list has been moved

2012-07-08 Thread Martin Mares
The linux-input mailing list has been moved to vger.kernel.org. See http://vger.kernel.org/vger-lists.html for information on the new list server (or consult your local oracle). Yours virtually, Martin Mares -- To unsubscribe from this list:

Re: [PATCH] branch: add -u as a shortcut for --set-upstream

2012-07-08 Thread Carlos Martín Nieto
On Fri, 2012-07-06 at 10:32 -0500, Jonathan Nieder wrote: Hi Carlos, Carlos Martín Nieto wrote: Add this shortcut just like git-push has it. [...] --- a/builtin/branch.c +++ b/builtin/branch.c @@ -724,7 +724,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)

Re: Problems pushing???

2012-07-08 Thread Konstantin Khomoutov
On Sun, Jul 08, 2012 at 02:12:46AM -0700, pbGit wrote: I have installed git locally to my machine. It is running mac os lion. This is intended to be the remote machine too. I have followed, what I think is the correct way to do this, using

Re: Problems pushing???

2012-07-08 Thread Holger Hellmuth
Am 08.07.2012 11:12, schrieb pbGit: http://www.petermac.com/setup-git-local-and-remote-repositories/ this . All The recipe at this address seems to have a --bare parameter missing at the git init in step 7 -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: Problems pushing???

2012-07-08 Thread Konstantin Khomoutov
On Sun, Jul 08, 2012 at 01:52:03PM +0200, Holger Hellmuth wrote: http://www.petermac.com/setup-git-local-and-remote-repositories/ this . All The recipe at this address seems to have a --bare parameter missing at the git init in step 7 The OP stated that «This is intended to be the remote

[PATCH v8] git on Mac OS and precomposed unicode

2012-07-08 Thread Torsten Bögershausen
Mac OS X mangles file names containing unicode on file systems HFS+, VFAT or SAMBA. When a file using unicode code points outside ASCII is created on a HFS+ drive, the file name is converted into decomposed unicode and written to disk. No conversion is done if the file name is already decomposed

Re: [PATCH v8] git on Mac OS and precomposed unicode

2012-07-08 Thread Andreas Schwab
Torsten Bögershausen tbo...@web.de writes: Unlike on HFS+, Mac OS X files on a VFAT drive (e.g. an USB drive), in ^stores? ^s/,// precomposed unicode, but readdir() still returns file names in decomposed unicode. Andreas. -- Andreas Schwab,

[PATCH v9] git on Mac OS and precomposed unicode

2012-07-08 Thread Torsten Bögershausen
Mac OS X mangles file names containing unicode on file systems HFS+, VFAT or SAMBA. When a file using unicode code points outside ASCII is created on a HFS+ drive, the file name is converted into decomposed unicode and written to disk. No conversion is done if the file name is already decomposed

Re: Problems pushing???

2012-07-08 Thread pbGit
Hi Holger, I think you were correct. I deleted my git init on the remote(Well, locally on my machine...), did what you said I was able to push successfully. Can I check the files have been successfully transferred to correct location??? Just wanted a bit of confidence it has done what it

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-08 Thread Jens Lehmann
Am 08.07.2012 09:32, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: One possible sane behaviour of git rm $path might be: - If --force is given, remove it from the index and from the working tree (i.e. rm -rf $path), but use the gitfile facility to save $path/.git

Re: Problems pushing???

2012-07-08 Thread pbGit
Just tried starting again on my local machine because when I tried pushing, git said that it local was also set to bare init. When I looked this was the case. Silly me. So I deleted on my local and added a single file and when I try pushing this I get the following: ! [rejected]

[PATCH] git-remote-mediawiki: update comments to reflect credential support

2012-07-08 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Junio, can you add this to mm/credential-plumbing in pu, or better, squash it into the last patch of the serie (i.e. a7271ad1dccaf1, git-remote-mediawiki: add credential support)? Thanks, contrib/mw-to-git/git-remote-mediawiki | 7 +--

Re: Problems pushing???

2012-07-08 Thread Holger Hellmuth
Am 08.07.2012 17:43, schrieb pbGit: Just tried starting again on my local machine because when I tried pushing, git said that it local was also set to bare init. When I looked this was the case. Silly me. So I deleted on my local and added a single file and when I try pushing this I get the

On using receive.denyNonFastForwards and advice.pushNonFastForward

2012-07-08 Thread Hilco Wijbenga
Hi all, I was wondering how hard it would be to make git push more adamant about not pushing non-ff updates. So I wanted to see the effects of receive.denyNonFastForwards and advice.pushNonFastForward. (By the way, why is one plural and the other singular? That doesn't seem consistent?)

Please pull git-po master branch with l10n updates for several languages

2012-07-08 Thread Jiang Xin
Hi Junio, The following changes since commit 726016725d45894c061e8d187385327f82803c9f: Sync with i18n-po updates in maint (2012-07-02 15:37:54 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to

Re: [PATCH] Restore umasks influence on the permissions of work tree created by clone

2012-07-08 Thread Junio C Hamano
Alex Riesen raa.l...@gmail.com writes: The original (shell coded) version of the git-clone just used mkdir(1) to create the working directories. The builtin changed the mode argument to mkdir(2) to 0755, which was a bit unfortunate, as there are use A much more important reason why this is a

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-08 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: What you describe here is exactly how I think git submodule rm and git rm --recurse-submodules should behave. If you have a directory A with a file B in it (i.e. A/B), git rm A is refused and you have to say git rm -r A. So I can see why the above

Re: [PATCH] git-remote-mediawiki: update comments to reflect credential support

2012-07-08 Thread Junio C Hamano
thanks; done. -- 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: [PATCH v2 1/2] test: git-stash conflict sets up rerere

2012-07-08 Thread Junio C Hamano
Phil Hord ho...@cisco.com writes: Add a failing test to confirm a conflicted stash apply invokes rerere to record the conflicts and resolve the the files it can. OK. In this failing state, mergetool may be confused by a left-over state from previous rerere activity. It is unclear to me

Re: [PATCH/RFC v2 2/2] Replace strlen() with ce_namelen()

2012-07-08 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: Replace strlen(ce-name) with ce_namelen() in a couple of places which gives us some additional bits of performance. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com Very sensible, with or without the previous patch. I am kind of surprised

Re: [PATCH/RFC v2 1/2] Strip namelen out of ce_flags into a ce_namelen field

2012-07-08 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: Strip the name length from the ce_flags field and move it into its own ce_namelen field in struct cache_entry. This will both give us a tiny bit of a performance enhancement when working with long pathnames and is part of the refactoring for the

Re: [RFC PATCH 1/2] rm: don't fail when removing populated submodules

2012-07-08 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Nope. Only the --recursive option to the git submodule script works like that (and almost everyone seems to use that option by default anyway). But for all commands that understand the --recurse-submodule option (currently these are clone, fetch,

Re: On using receive.denyNonFastForwards and advice.pushNonFastForward

2012-07-08 Thread Christopher Tiwald
From: Christopher Tiwald christiw...@gmail.com To: Hilco Wijbenga hilco.wijbe...@gmail.com Cc: Git Users git@vger.kernel.org Bcc: Subject: Re: On using receive.denyNonFastForwards and advice.pushNonFastForward Reply-To: In-Reply-To: