Re: [BUG] --bare is ignored before command word

2015-11-18 Thread Jeff King
On Wed, Nov 18, 2015 at 10:29:20PM +0100, Matthieu Moy wrote: > But as you say, options before the command word apply to "git", not to > the particular command. The case of --bare is a bit unfortunate: both > "git" and "git clone" accept a --bare option, with a different meaning > (read "man git"

Re: [PATCH] notes: allow merging from arbitrary references

2015-11-18 Thread Jacob Keller
On Wed, Nov 18, 2015 at 2:29 PM, Johan Herland wrote: > On Mon, Nov 16, 2015 at 8:41 PM, Jacob Keller wrote: >> The main other issue is how to get notes DWIM things to work for all >> cases where we want to use notes refs, since right now the DWIM is >> basically done at the top level and only ha

Re: [PATCH] notes: allow merging from arbitrary references

2015-11-18 Thread Johan Herland
On Mon, Nov 16, 2015 at 8:41 PM, Jacob Keller wrote: > The main other issue is how to get notes DWIM things to work for all > cases where we want to use notes refs, since right now the DWIM is > basically done at the top level and only handles notes like things. > The problem with it is that if yo

Re: [BUG] gitk --all and git bisect visualize crash in non-english locale

2015-11-18 Thread Dennis Kaarsemaker
Hi Matthieu, This has been reported quite a few times before. A fix is in master, see 482456a^2 and children. On wo, 2015-11-18 at 19:31 +0100, Matthieu Moy wrote: > Hi, > > I'm getting the following crash on recent gitk: > > $ LANG=fr_FR gitk --all > Error in startup script: bad menu entry

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-18 Thread Stefan Beller
On Wed, Nov 18, 2015 at 1:11 PM, Jeff King wrote: > On Wed, Nov 18, 2015 at 01:32:36PM +0100, Duy Nguyen wrote: > >> Yeah I think that was the 10k commits in Shawn's mail: the number of >> commits we may have to walk until we hit a reachability bitmap. It >> looks like C Git will create a bitmap e

Re: [BUG] --bare is ignored before command word

2015-11-18 Thread Matthieu Moy
Jacob Keller writes: > On Wed, Nov 18, 2015 at 9:20 AM, Ronny Borchert wrote: >> I was trying to clone a bare repository. Not sure why I did, maybe >> description on website was wrong. >> My try: >> >> git --bare clone https://github. >> >> This was leading in creating a none bare repository

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-18 Thread Jeff King
On Wed, Nov 18, 2015 at 01:32:36PM +0100, Duy Nguyen wrote: > Yeah I think that was the 10k commits in Shawn's mail: the number of > commits we may have to walk until we hit a reachability bitmap. It > looks like C Git will create a bitmap every 5k commits, not 10k, > though, if I read the code co

Re: push failure on domain-connected machine

2015-11-18 Thread Stefan Beller
+ Johannes Though git for windows tracks its bugs at https://github.com/git-for-windows/git/issues I think. On Wed, Nov 18, 2015 at 8:47 AM, Erik Blake wrote: > When pushing an existing local repo to a new remote repo, git 2.6.3 > misidentifies the user's home directory on a domain-connected Win

Re: [BUG] --bare is ignored before command word

2015-11-18 Thread Jacob Keller
On Wed, Nov 18, 2015 at 9:20 AM, Ronny Borchert wrote: > I was trying to clone a bare repository. Not sure why I did, maybe > description on website was wrong. > My try: > > git --bare clone https://github. > > This was leading in creating a none bare repository! No error or warning > message

[BUG] gitk --all and git bisect visualize crash in non-english locale

2015-11-18 Thread Matthieu Moy
Hi, I'm getting the following crash on recent gitk: $ LANG=fr_FR gitk --all Error in startup script: bad menu entry index "Éditer la vue..." while executing ".bar.view entryconf [mca "Edit view..."] -state normal" invoked from within "if {$cmdline_files ne {} || $revtreeargs n

Re: Three dot notion used inconsitent?

2015-11-18 Thread Andreas Schwab
Lars Schneider writes: > git diff branchA...branchB > --> gives me the diff between (the common ancestor of A and B) and B. That > means I never see changes on branchA. > > git log branchA...branchB > --> gives me the commits reachable from A and B. That includes changes from > branchA. > > Is

[BUG] --bare is ignored before command word

2015-11-18 Thread Ronny Borchert
I was trying to clone a bare repository. Not sure why I did, maybe description on website was wrong. My try: git --bare clone https://github. This was leading in creating a none bare repository! No error or warning message here! I guess this behavior is also for other --xxx commands. -- To u

push failure on domain-connected machine

2015-11-18 Thread Erik Blake
When pushing an existing local repo to a new remote repo, git 2.6.3 misidentifies the user's home directory on a domain-connected Windows machine. My machine is running Win7-64 and I have tried both the 32-bit and 64-bit version of git. For example, the following sequence fails on the last command

Unhelpful shortcut parameters for git bash

2015-11-18 Thread Erik Blake
When creating shortcuts for git bash on Windows machines, the "Target" contains the command "C:\PF\Git\git-bash.exe --cd-to-home" and the "Start In" field contains %HOMEDRIVE%%HOMEPATH%. This is redundant, and makes it harder to modify the shortcut to start bash in the user's directory of choice.

git rm --recursive

2015-11-18 Thread Hans Ginzel
Hello! I have added the --recursive alias for the -r option to the rm command. H. From 83f197151c04164b0dfd4d127e72439aebaf8b71 Mon Sep 17 00:00:00 2001 From: Hans Ginzel Date: Wed, 18 Nov 2015 15:44:56 +0100 Subject: [PATCH] builtin: rm: add --recursive to be consistent with GNU rm diff --

git cherry-pick gives error: addinfo_cache failed for path

2015-11-18 Thread Andrei Neculau
UPDATE: The initial message (see below) got rejected because it wasn't text/plain, so meanwhile a few things happened. I was reading the manual pages of gitattributes and saw the note > When text=auto normalization is enabled in an existing repository, any text > files containing CRLFs should b

Re: [PATCH v2] add test to demonstrate that shallow recursive clones fail

2015-11-18 Thread Duy Nguyen
On Tue, Nov 17, 2015 at 10:43 PM, Jeff King wrote: > On Tue, Nov 17, 2015 at 09:17:43PM +0100, Duy Nguyen wrote: > >> On Mon, Nov 16, 2015 at 8:25 PM, Stefan Beller wrote: >> > Instead of having to search all branches for the requested sha1, we could >> > have >> > some sort of data structure to

Re: Three dot notion used inconsitent?

2015-11-18 Thread Johannes Löthberg
On 18/11, Lars Schneider wrote: git diff branchA...branchB --> gives me the diff between (the common ancestor of A and B) and B. That means I never see changes on branchA. git log branchA...branchB --> gives me the commits reachable from A and B. That includes changes from branchA. Is this be

Re: [PATCH] blame: add test case for using tag object as a final ref

2015-11-18 Thread Max Kirillov
On Wed, Nov 18, 2015 at 8:00 AM, Jeff King wrote: > On Wed, Nov 18, 2015 at 07:36:32AM +0200, Max Kirillov wrote: > >> It was discovered [1] that 1b0d4a broke blaming starting from tag object. >> Add test which verifies such blaming works. >> >> [1] http://mid.gmane.org/20151117224809.ge27...@

Three dot notion used inconsitent?

2015-11-18 Thread Lars Schneider
Hi, I just stumbled across the this: git diff branchA...branchB --> gives me the diff between (the common ancestor of A and B) and B. That means I never see changes on branchA. git log branchA...branchB --> gives me the commits reachable from A and B. That includes changes from branchA. Is th

Re: race condition when pushing

2015-11-18 Thread Johannes Schindelin
Hi Lyle, your quoting seems a bit funny; I fixed it by indenting *my* words one more level. On Tue, 17 Nov 2015, Lyle Ziegelmiller wrote: > [I, Johannes, wrote:] > > > Please note that this code is active in Git for Windows (i.e. the > > *MinGW* version of Git) but not in Cygwin Git (nor the MSy

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-18 Thread Johannes Schindelin
Hi Mike, On Tue, 17 Nov 2015, Mike Rappazzo wrote: > On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber > wrote: > > Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > > > > I still don't like the idea of having a new command just for the purpose > > of fast-forwarding local branches from spe