Git crash in Ubuntu 12.04

2013-04-10 Thread Sivaram Kannan
Hi, I am using git with Gitlab/Gitolite configuration. Git version is 1.7.9.5 in Ubuntu 12.04. There has been a consistent git crash recently and have attached the /var/crash/_usr_lib_git-core_ git.1001.crash file. The crash output is pasted in the following link http://pastebin.com/uAQS81BX I

[PATCH v3 0/7] completion: reorg and performance improvements

2013-04-10 Thread Felipe Contreras
Hi, I sent these some time ago for comments, but I think they are ready. Basically some reorganization in order to achieve some performance improvements, also, fix a few bugs. Felipe Contreras (7): completion: trivial test improvement completion: get rid of empty COMPREPLY assignments

[PATCH v3 1/7] completion: trivial test improvement

2013-04-10 Thread Felipe Contreras
Instead of passing a dummy , let's check if the last character is a space, and then move the _cword accordingly. Apparently we were passing all the way to compgen, which fortunately expanded it to nothing. Lets do the right thing though. Signed-off-by: Felipe Contreras

[PATCH v3 2/7] completion: get rid of empty COMPREPLY assignments

2013-04-10 Thread Felipe Contreras
There's no functional reason for those, the only purpose they are supposed to serve is to say we don't provide any words here, but even for that it's not used consitently. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 21

[PATCH v3 3/7] completion: add new __gitcompadd helper

2013-04-10 Thread Felipe Contreras
The idea is to never touch the COMPREPLY variable directly. This allows other completion systems (i.e. zsh) to override __gitcompadd, and do something different instead. Also, this allows further optimizations down the line. There should be no functional changes. Signed-off-by: Felipe

[PATCH v3 4/7] completion: add __gitcomp_nl tests

2013-04-10 Thread Felipe Contreras
Original patch by SZEDER Gábor. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t9902-completion.sh | 60 +++ 1 file changed, 60 insertions(+) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 99d5c01..b752f4d

[PATCH v3 5/7] completion: get rid of compgen

2013-04-10 Thread Felipe Contreras
The functionality we use from compgen is not much, we can do the same manually, with drastical improvements in speed, specially when dealing with only a few words. This patch also has the sideffect that brekage reported by Jeroen Meijer and SZEDER Gábor gets fixed because we no longer expand the

[PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread Felipe Contreras
There's no point in calling a separate function that is only used in one place. Specially considering that there's no need to call compgen, and we traverse the words ourselves both in __gitcompadd, and __gitcomp_1. So lets squash the functions together, and traverse only once. This improves

[PATCH v3 7/7] completion: small optimization

2013-04-10 Thread Felipe Contreras
No need to calculate a new $c with a space if we are not going to do anything it with it. There should be no functional changes, except that a word foo with no suffixes can't be matched. But $cur cannot have a space at the end anyway. So it's safe. Based on the code from SZEDER Gábor.

Re: [RFC/PATCH 0/7] Rework git core for native submodules

2013-04-10 Thread Philip Oakley
From: Ramkumar Ramachandra artag...@gmail.com Sent: Monday, April 08, 2013 10:03 PM This is going nowhere. You're stuck at making the current submodule system work, not answering my questions, diverting conversation, repeatedly asking the same stupid questions, labelling everything that I say

Re: Git crash in Ubuntu 12.04

2013-04-10 Thread Thomas Rast
Sivaram Kannan siva.de...@gmail.com writes: Hi, I am using git with Gitlab/Gitolite configuration. Git version is 1.7.9.5 in Ubuntu 12.04. There has been a consistent git crash recently and have attached the /var/crash/_usr_lib_git-core_ git.1001.crash file. The crash output is pasted in

git rebase : knowing where I am...

2013-04-10 Thread Jeremy Rosen
Hello is there some way to know how far you are within a rebase when the rebase is interupted by a conflict other than the message given by git rebase when it was interrupted ? I would have expected a git rebase --status or something similar... Regards Jérémy Rosen fight key loggers

[PATCH] completion: add more cherry-pick options

2013-04-10 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.bash | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 93eba46..d257b90 100644 ---

Re: [PATCH v3 2/7] completion: get rid of empty COMPREPLY assignments

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: There's no functional reason for those, the only purpose they are supposed to serve is to say we don't provide any words here, but even for that it's not used consitently. s/consitently/consistently/

Re: [PATCH v3 5/7] completion: get rid of compgen

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: The functionality we use from compgen is not much, we can do the same manually, with drastical improvements in speed, specially when dealing s/drastical/drastic/ s/specially/especially/ with only a few words.

Re: [PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: There's no point in calling a separate function that is only used in one place. Specially considering that there's no need to call compgen, and s/Specially/Especially/ we traverse the words ourselves both in

Re: [PATCH 1/4] gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

2013-04-10 Thread Jakub Narębski
On 09.04.2013 at 23:59, Jürgen Kreileder wrote: Jakub Narębski jna...@gmail.com writes: On 08.04.2013, Junio C Hamano wrote: j...@blackdown.de (Jürgen Kreileder) writes: Fixes the encoding for several _plain actions and for text/* and */*+xml blobs. Signed-off-by: Jürgen Kreileder

Re: [PATCH v3 5/7] completion: get rid of compgen

2013-04-10 Thread John Keeping
On Wed, Apr 10, 2013 at 06:07:33AM -0500, Felipe Contreras wrote: On Wed, Apr 10, 2013 at 5:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote: s/specially/especially/ http://www.merriam-webster.com/dictionary/specially But see also:

Re: [PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread John Keeping
On Wed, Apr 10, 2013 at 06:13:06AM -0400, Eric Sunshine wrote: On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: we traverse the words ourselves both in __gitcompadd, and __gitcomp_1. s/ourselves/ourself/ Huh? we traverse ... ourselves is correct since

Re: [BUG] shallow clones over http

2013-04-10 Thread Tom
Jeff King peff at peff.net writes: I'm trying to track down a protocol bug that happens with shallow clones over smart-http. As far as I can tell, the bug has existed in all versions. You can reproduce it using the attached repository, which is a shallow clone of

Re: [BUG] shallow clones over http

2013-04-10 Thread Ramkumar Ramachandra
Tom wrote: git pull --depth=9 Unrelated nit: we now have git fetch --unshallow. -- 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: [BUG] shallow clones over http

2013-04-10 Thread Tom
The problem occurs to me also when I want to deepen a shallow clone of MediaWiki via https:// git clone --depth 1 https://gerrit.wikimedia.org/r/p/mediawiki/core.git git pull --depth=9 fatal: git fetch-pack: expected shallow list. Perhaps it helps someone to find the reason. UPDATE:

Re: [PATCH] glossary: extend detached HEAD description

2013-04-10 Thread Jakub Narębski
Junio C Hamano wrote: diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f928b57..69c90d1 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -100,9 +100,22 @@ to point at the new commit.

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jonathan Nieder wrote: git push origin korg -- master; # push master to 2 remotes git push -- master next; # push two refs to default remote git push origin -- master; # push master to origin, more explicitly git push origin korg --; # push default refspec to 2

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: git push --remote=host:some/path if we are willing to break the existing syntax. Though your proposal does have the benefit of breaking only one particular syntax which is (I'm guessing) less frequently used. But we'd still need the usual deprecation period, I think. Why?

Re: [PATCH 2/2] add: refuse to add paths beyond repository boundaries

2013-04-10 Thread Ramkumar Ramachandra
Junio C Hamano wrote: And I also misread we currently don't handle above as but we really should allow adding d/f when d is at the top of the working tree of another project, but that was not what you meant to say. Instead, We do not notice such a bad case in today's code yet was what you

Re: [PATCH 2/2] add: refuse to add paths beyond repository boundaries

2013-04-10 Thread Ramkumar Ramachandra
Junio C Hamano wrote: One can have symlinks to anywhere all one wants. We track symlinks. [...] Yes, I know. We store symlinks as blobs containing one line, the path to the file, without a trailing newline. And we have a mode for it to distinguish it from regular files. What I meant is:

Re: [PATCH] test-lint-duplicates: Only check for numbered test cases

2013-04-10 Thread Torsten Bögershausen
On 03.04.13 16:28, Jeff King wrote: On Wed, Apr 03, 2013 at 07:54:02AM +0200, Torsten Bögershausen wrote: Running make inside contrib/remote-helpers fails in test-lint-duplicates This was because the regexp checking for duplicate numbers strips everything after the first - in the filename,

[PATCH] test-lint-duplicates: consider only numbered test cases

2013-04-10 Thread Torsten Bögershausen
Running make inside contrib/remote-helpers may fail in test-lint-duplicates This was because the regexp checking for duplicate numbers strips everything after the first - in the filename, including the prefix. As a result, 2 pathnames like /contrib/remote-helpers/test-XX.sh and

[rfh] do I need to use something more complex to do this?

2013-04-10 Thread Junio C Hamano
I have set of items with two attributes, X,Y, and would like to keep them in some data structure in such a way that it is efficient to (1) add a new item to the data structure, and (2) pick an item in a specific order. There can be multiple items that share the same value for X, or Y, or both X

Re: [PATCH] glossary: extend detached HEAD description

2013-04-10 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: Junio C Hamano wrote: diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f928b57..69c90d1 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -100,9 +100,22 @@ to point

[PATCH] git-imap-send.txt: remove the use of sslverify=false in GMail example

2013-04-10 Thread Barbu Paul - Gheorghe
Since GMail is SSL capable there is no need to set sslverify to false, the example using it may confuse readers that it's needed since it's also used in the previous example configurations, too Signed-off-by: Barbu Paul - Gheorghe barbu.paul.gheor...@gmail.com --- Documentation/git-imap-send.txt

Re: [rfh] do I need to use something more complex to do this?

2013-04-10 Thread Andreas Ericsson
On 04/10/2013 04:40 PM, Junio C Hamano wrote: I have set of items with two attributes, X,Y, and would like to keep them in some data structure in such a way that it is efficient to (1) add a new item to the data structure, and (2) pick an item in a specific order. There can be multiple items

เมื่อน้ำแล้งเราก็มีฝนหลวง

2013-04-10 Thread pviolet...@hotmail.com
...แต่มาเงยดูท้องฟ้า มีเมฆ ทำไมมีเมฆอย่างนี้ ทำไมจะดึงเมฆนี่ลงมาให้ได้ ก็เคยได้ยินเรื่องการทำฝน ก็มาปรารภ

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 06:52:51PM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: git push --remote=host:some/path if we are willing to break the existing syntax. Though your proposal does have the benefit of breaking only one particular syntax which is (I'm guessing) less

Re: [PATCH] test-lint-duplicates: Only check for numbered test cases

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 04:14:34PM +0200, Torsten Bögershausen wrote: test-lint-duplicates: - @dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` \ + @dups=`echo $(T) | tr ' ' '\n' | \ + sed -e 's,.*/,,' -e 's/\(t[0-9][0-9][0-9][0-9]\)-.*/\1/' | \ +

Re: [PATCH] test-lint-duplicates: consider only numbered test cases

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 04:22:57PM +0200, Torsten Bögershausen wrote: Running make inside contrib/remote-helpers may fail in test-lint-duplicates This was because the regexp checking for duplicate numbers strips everything after the first - in the filename, including the prefix. As a

Re: [PATCH 2/2] add: refuse to add paths beyond repository boundaries

2013-04-10 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Exactly. Yeah, I don't think you patch makes sense as a standalone anyway. Yes, it was purely a preparatory step. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Apr 09, 2013 at 06:19:01PM -0700, Junio C Hamano wrote: git push -- master next; # push two refs to default remote ... or default push remote if there is one, I presume? As you are giving what to push, I am assuming that branch.$name.remote

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Apr 09, 2013 at 04:13:32PM -0700, Jonathan Nieder wrote: Random idea: today you can do git push origin master; # push branch master to remote origin git push --multiple origin korg; # push default refspec to 2 remotes Can we do git push

Re: [PATCH/RFC 2/3] Teach mv to move submodules using a gitfile

2013-04-10 Thread Jens Lehmann
Am 10.04.2013 01:08, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: diff --git a/submodule.c b/submodule.c index 975bc87..eba9b42 100644 --- a/submodule.c +++ b/submodule.c @@ -1001,3 +1001,67 @@ int merge_submodule(unsigned char result[20], const char *path, ... +

Re: tar on Mac does not like empty tar from git archive

2013-04-10 Thread René Scharfe
Am 08.04.2013 20:36, schrieb BJ Hargrave: Git 1.8.2.1 includes commit bd54cf17 - archive: handle commits with an empty tree Test 2 of t5004-archive-corner-cases, tar archive of empty tree is empty, fails on Mac OS X 10.8.3 (with XCode 4.6.1) since the tar command exits with return code 1 on

Re: git instaweb - share all project files

2013-04-10 Thread Jakub Narębski
W dniu 07.04.2013 05:02, Trenton D. Adams pisze: On that first page that shows up, it shows the .git folder. It would be kind of nice if it shared out both the git repo and the actual current project files. I frequently have stuff I'd like to see in a web browser, and even requires one

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 09:37:01AM -0700, Junio C Hamano wrote: The missing case 4 is obviously: dst=missing, refs=present ... Do you want to explain your thinking? I'm guessing it has to do with the fact that choosing branch.*.remote is about trying to push to the configured

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 09:38:26AM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Tue, Apr 09, 2013 at 04:13:32PM -0700, Jonathan Nieder wrote: Random idea: today you can do git push origin master; # push branch master to remote origin git push --multiple

[PATCH] archive: clarify explanation of --worktree-attributes

2013-04-10 Thread René Scharfe
Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PDW). Link to the ATTRIBUTES section, which has more details. Reported-by: Amit Bakshi ambak...@gmail.com Signed-off-by: Rene Scharfe

Re: Advice and repo setup

2013-04-10 Thread Jakub Narębski
Michael Campbell wrote: My company is moving from CVS to git in a few weeks (and we have a training class scheduled with the github folks). That said our CI/build guys have already got gitorious set up (we get to it through ssh with ssh keys and one git user on the server) Note that

[PATCH] rebase: use -f for checkout

2013-04-10 Thread Orgad Shaneh
If a file's case is changed on rename (Foo - foo), rebase fails on Windows because the file already exists. The change is safe, because if working directory is not clean rebase fails before checking out. --- git-rebase.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: git rebase : knowing where I am...

2013-04-10 Thread Junio C Hamano
Jeremy Rosen jeremy.ro...@openwide.fr writes: is there some way to know how far you are within a rebase when the rebase is interupted by a conflict other than the message given by git rebase when it was interrupted ? I do not think there is a git $anything command to do that, but in the

Re: [rfh] do I need to use something more complex to do this?

2013-04-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I have set of items with two attributes, X,Y, and would like to keep them in some data structure in such a way that it is efficient to (1) add a new item to the data structure, and (2) pick an item in a specific order. There can be multiple items that

Re: [PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 7:35 AM, John Keeping j...@keeping.me.uk wrote: On Wed, Apr 10, 2013 at 06:13:06AM -0400, Eric Sunshine wrote: On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: we traverse the words ourselves both in __gitcompadd, and __gitcomp_1.

[PATCH] submodule: add verbose mode for add/update

2013-04-10 Thread Orgad Shaneh
Executes checkout without -q --- git-submodule.sh | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 79bfaac..f7964ad 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,11 +5,11 @@ # Copyright (c) 2007

Re: [PATCH] glossary: extend detached HEAD description

2013-04-10 Thread Jakub Narębski
W dniu 10.04.2013 16:45, Junio C Hamano pisze: Jakub Narębski jna...@gmail.com writes: Junio C Hamano wrote: diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f928b57..69c90d1 100644 --- a/Documentation/glossary-content.txt +++

Re: [PATCH] archive: clarify explanation of --worktree-attributes

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 1:49 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PDW). Link to the ATTRIBUTES section, which has

Re: [PATCH] git-imap-send.txt: remove the use of sslverify=false in GMail example

2013-04-10 Thread Junio C Hamano
Barbu Paul - Gheorghe barbu.paul.gheor...@gmail.com writes: Since GMail is SSL capable there is no need to set sslverify to false, the example using it may confuse readers that it's needed since it's also used in the previous example configurations, too Signed-off-by: Barbu Paul - Gheorghe

Re: segfault in git-remote-http

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 09:08:50AM -0700, rh wrote: which should show both program names. Git invokes git-remote-* based on the URL you fed it. So if you are seeing a segfault in git-remote-http, presumably you fed it an http URL (which may still execute SSL code if it redirects to an

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Junio C Hamano
Jeff King p...@peff.net writes: With the branch.$name.remote, the user tells us When I am on this branch, I want to talk to this remote. When you did git push -- master next ;# case #4 on branch maint, branch.maint.remote should not come into play. I understand that's your

Re: [PATCH] archive: clarify explanation of --worktree-attributes

2013-04-10 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PDW). Link to the ATTRIBUTES section, which has more details. Reported-by: Amit

Re: [msysGit] Script for handling UTF-16 files

2013-04-10 Thread Karsten Blees
Am 10.04.2013 01:47, schrieb Ken Ismert: I bumped into the UTF-16 display problem with Git Extensions running on top of msysGit. After lots of searching and experimenting, I came up with a solution that works for me. Note: Please see questions below. This method is for MSysGit 1.8.1,

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 11:54:34AM -0700, Junio C Hamano wrote: If branch.$name.remote is when I am on this branch, I want to talk to this remote, that rule is not be impacted by the presence of refspecs at all. So running the above while on 'maint' will send master and next to the

[PATCH] gitk: workaround Tcl/Tk Cmd-TAB behavior on OSX

2013-04-10 Thread Tair Sabirgaliev
On OSX Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is trivial: if we are on OSX, emulate Cmd-Shift-TAB key event, so that

[PATCH 1/2] strbuf: create strbuf_humanize() to show byte sizes

2013-04-10 Thread Antoine Pelisse
Currently, humanization of downloaded size is done in the same function as text formatting in 'process.c'. This is an issue if anyone else wants to use this. Separate text formatting from size simplification and make the function public in strbuf so that it can easily be used by other clients.

[PATCH 2/2] count-objects: add -H option to humanize sizes

2013-04-10 Thread Antoine Pelisse
Use the new humanize() function to print loose objects size, pack size, and garbage size in verbose mode, or loose objects size in regular mode. This patch doesn't change the way anything is displayed when the option is not used. Also update the documentation. Signed-off-by: Antoine Pelisse

Re: segfault in git-remote-http

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 02:51:14PM -0400, Jeff King wrote: As for why dmesg reports git-remote-http, I'm not sure. If you strace -f the command, you can see that git is running git-remote-https. Why the kernel chooses to report git-remote-http, I don't know; you'd have to look into how the

Re: [PATCH] gitk: workaround Tcl/Tk Cmd-TAB behavior on OSX

2013-04-10 Thread Tair Sabirgaliev
The prev message was garbled :( Here is the correct patch (I hope). On OSX Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is

Re: [PATCH v3 08/20] remote-hg: split bookmark handling

2013-04-10 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 12:13 PM, Felipe Contreras felipe.contre...@gmail.com wrote: --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -731,6 +722,26 @@ def do_export(parser): if peer: parser.repo.push(peer, force=False) +# handle

Re: [PATCH v3 12/20] remote-hg: push to the appropriate branch

2013-04-10 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 12:13 PM, Felipe Contreras felipe.contre...@gmail.com wrote: --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -625,6 +625,10 @@ def parse_commit(parser): if merge_mark: get_merge_files(repo, p1, p2, files) +#

Re: git rebase : knowing where I am...

2013-04-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeremy Rosen jeremy.ro...@openwide.fr writes: is there some way to know how far you are within a rebase when the rebase is interupted by a conflict other than the message given by git rebase when it was interrupted ? I do not think there is a git

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: On Wed, Apr 10, 2013 at 11:54:34AM -0700, Junio C Hamano wrote: If branch.$name.remote is when I am on this branch, I want to talk to this remote, that rule is not be impacted by the presence of refspecs at all. So running the above while on 'maint' will send master and

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: Otherwise, I think we're consistent. git push master; pushes the refspec master (with no explicit :dst counterpart) to the default place to push to (either depending on which branch I am, or global). I think Junio was mixing up refspecs with refs (branches, and

Re: [PATCH] glossary: extend detached HEAD description

2013-04-10 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: P.S. From some StackOverflow questions the connection between (no branch) and detached HEAD is not clear for git newbies... If _that_ is the problem you are really trying to address, the output from recent Git already says (detached from xx) or

Re: [PATCH v3 08/20] remote-hg: split bookmark handling

2013-04-10 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Apr 8, 2013 at 12:13 PM, Felipe Contreras felipe.contre...@gmail.com wrote: --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -731,6 +722,26 @@ def do_export(parser): if peer:

Re: [PATCH 1/2] strbuf: create strbuf_humanize() to show byte sizes

2013-04-10 Thread Jonathan Nieder
Antoine Pelisse wrote: Separate text formatting from size simplification and make the function public in strbuf so that it can easily be used by other clients. We now can use strbuf_humanize() for both downloaded size and download speed calculation. Sounds like a good thing to do.

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Thu, Apr 11, 2013 at 01:01:33AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: On Wed, Apr 10, 2013 at 11:54:34AM -0700, Junio C Hamano wrote: If branch.$name.remote is when I am on this branch, I want to talk to this remote, that rule is not be impacted by the presence of

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: git push -- master next; pushes to my current branch's branch.name.pushremote? Isn't that a disaster? Actually, branch.name.pushremote already breaks the current design in a way, as Junio pointed out in a different email: a push.default set to anything except

Re: segfault in git-remote-http

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 12:16:25PM -0700, rh wrote: This returns no error on the command line and produced the segfault reported by the kernel. git clone returns immediately. It does correctly report a failed exit code. The lack of message is because git assumes that the helper will

Re: [PATCH 1/2] strbuf: create strbuf_humanize() to show byte sizes

2013-04-10 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: Currently, humanization of downloaded size is done in the same function as text formatting in 'process.c'. This is an issue if anyone else wants to use this. Separate text formatting from size simplification and make the function public in strbuf

Re: [PATCH 1/2] strbuf: create strbuf_humanize() to show byte sizes

2013-04-10 Thread Antoine Pelisse
On Wed, Apr 10, 2013 at 9:43 PM, Jonathan Nieder jrnie...@gmail.com wrote: Antoine Pelisse wrote: One of the drawbacks is that speed will now look like this when download is stalled: 0 bytes/s instead of 0 KiB/s. At first glance that is neither obviously a benefit nor

Re: [PATCH] submodule: add verbose mode for add/update

2013-04-10 Thread Jens Lehmann
Am 10.04.2013 20:24, schrieb Orgad Shaneh: Executes checkout without -q Nice, looks like you picked the proposal I made last September: http://permalink.gmane.org/gmane.comp.version-control.git/204747 The change is looking good, but you still need to document the new option in

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Ramkumar Ramachandra wrote: git push -- master next; pushes to my current branch's branch.name.pushremote? Isn't that a disaster? Actually, branch.name.pushremote already breaks the current design in a way I don't see a big problem here, actually. What's so

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Thu, Apr 11, 2013 at 01:23:57AM +0530, Ramkumar Ramachandra wrote: Ramkumar Ramachandra wrote: git push -- master next; pushes to my current branch's branch.name.pushremote? Isn't that a disaster? Actually, branch.name.pushremote already breaks the current design in a way, as Junio

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: Maybe. But no more so than the current: git push which may also push master and next to the same remote. I would argue that this was not really a problem in practice, until I introduced branch.name.pushremote. Let us imagine that I was working on artagnon/git.git (remote:

[PATCH] submodule: add verbose mode for add/update

2013-04-10 Thread Orgad Shaneh
When 'git submodule add/update' is run there is no output during checkout. This can take a significant amount of time and it would be nice if user could enable some feedback to see what's going on. Add the -v/--verbose option to both add and update which suppresses the -q normally given to

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Wed, Apr 10, 2013 at 01:05:12PM -0700, Jonathan Nieder wrote: I don't see a big problem here, actually. What's so wrong with branch.name.remote affecting what git push does? If branch.crazy-feature.remote is my-personal-remote and I run git push and [push] default = upstream,

Re: [PATCH 1/2] strbuf: create strbuf_humanize() to show byte sizes

2013-04-10 Thread Antoine Pelisse
On Wed, Apr 10, 2013 at 9:57 PM, Junio C Hamano gits...@pobox.com wrote: Antoine Pelisse apeli...@gmail.com writes: Currently, humanization of downloaded size is done in the same function as text formatting in 'process.c'. This is an issue if anyone else wants to use this. Separate text

Fwd: [PATCH] submodule: add verbose mode for add/update

2013-04-10 Thread Orgad Shaneh
On Wed, Apr 10, 2013 at 11:00 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 10.04.2013 20:24, schrieb Orgad Shaneh: Executes checkout without -q Nice, looks like you picked the proposal I made last September: http://permalink.gmane.org/gmane.comp.version-control.git/204747 Took me a

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: On Thu, Apr 11, 2013 at 01:23:57AM +0530, Ramkumar Ramachandra wrote: Ramkumar Ramachandra wrote: git push -- master next; pushes to my current branch's branch.name.pushremote? Isn't that a disaster? Actually, branch.name.pushremote already breaks the current design in

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Thu, Apr 11, 2013 at 01:35:34AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: Maybe. But no more so than the current: git push which may also push master and next to the same remote. I would argue that this was not really a problem in practice, until I introduced

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Junio C Hamano
Jeff King p...@peff.net writes: If we changed push.default=matching to ignore branch.*.remote, then that would be consistent, and would probably be safer over all. It is a regression, but I doubt that anybody was using branch.*.remote for this; it really only makes sense with the upstream

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Thu, Apr 11, 2013 at 01:49:54AM +0530, Ramkumar Ramachandra wrote: Right, the example above might include multiple remotes if pushremote is respected. Or it might not come up with an answer at all for a tag. If you do: git push -- v1.2.3 master where does v1.2.3 go? To

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: As the author of branch.name.pushremote, I apologize for not having caught this earlier. I've been using push.default = current for a long time, and don't often think about the other settings. Possibly, but I do not know it is such a big issue.

Premerging topics (was: [RFD] annnotating a pair of commit objects?)

2013-04-10 Thread Antoine Pelisse
The goal is to propose a structure for storing and pre-merging pairs of commits. Data-structure == We could use a note ref to store the pre-merge information. Each commit would be annotated with a blob containing the list of pre-merges (one sha1 per line with sha1 pointing to a merge

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: On Thu, Apr 11, 2013 at 01:35:34AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: Maybe. But no more so than the current: git push which may also push master and next to the same remote. I would argue that this was not really a problem in practice, until I

Re: git-http-backend: anonymous read, authenticated write

2013-04-10 Thread Magnus Therning
On Tue, Apr 09, 2013 at 01:12:47PM -0400, Jeff King wrote: On Tue, Apr 09, 2013 at 07:45:53AM +0200, Magnus Therning wrote: I've been trying to set up git-http-backend+lighttpd. I've managed to set up anonymous read-only access, and I then successfully configured authentication for both

Re: git-http-backend: anonymous read, authenticated write

2013-04-10 Thread Magnus Therning
On Tue, Apr 09, 2013 at 02:24:26PM +0200, Jakub Narębski wrote: On 09.04.2013, Magnus Therning wrote: I've been trying to set up git-http-backend+lighttpd. I've managed to set up anonymous read-only access, and I then successfully configured authentication for both read and write. Then

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: On Thu, Apr 11, 2013 at 01:49:54AM +0530, Ramkumar Ramachandra wrote: Huh, why? Simply because he specified master alongside it? How can we infer what you said in a consistent system? That's kind of my point. Why would they put two refs together in a single push command?

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: Jeff King wrote: If we are not going to break the existing behavior, I think it can be argued that consistency and simplicity of the rules is important, so the user can predict what will happen. But the more we discuss, the more I think we should simply change the

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Jeff King
On Thu, Apr 11, 2013 at 02:25:59AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: On Thu, Apr 11, 2013 at 01:49:54AM +0530, Ramkumar Ramachandra wrote: Huh, why? Simply because he specified master alongside it? How can we infer what you said in a consistent system? That's kind

[PATCH v2 2/3] Teach mv to move submodules using a gitfile

2013-04-10 Thread Jens Lehmann
When moving a submodule which uses a gitfile to point to the git directory stored in .git/modules/name of the superproject two changes must be made to make the submodule work: the .git file and the core.worktree setting must be adjusted to point from work tree to git directory and back. Achieve

Re: [ITCH] Specify refspec without remote

2013-04-10 Thread Ramkumar Ramachandra
Jeff King wrote: But I think all of this discussion just reinforces my point. We do not have to agree on what the user intended. But the fact that we do not agree means that out of a sample size of 2 users, we have 2 different things the user expects to happen. If we choose a behavior and say

  1   2   >