Re: [PATCH 2/2] transport-helper: update remote helper namespace

2013-04-13 Thread Felipe Contreras
Hi, Why wasn't this patch merged to 'pu'? To my knowledge nobody raised any real concerns. Should I explain in every commit that touches transport-helper how remote-helpers without marks are impossible? I know I said I was going to update the commit message, but I don't think that reason to not

Re: [PATCH 1/2] transport-helper: report errors properly

2013-04-13 Thread Jeff King
On Sat, Apr 13, 2013 at 12:42:29AM -0500, Felipe Contreras wrote: To me, the reality is obvious: my patch didn't require such a big commit message, the short version was fine, the only reason Jeff King insisted on a longer version is because the patch came from me. Get over yourself. The

Re: [BUG] shallow clones over http

2013-04-13 Thread Jeff King
On Wed, Apr 10, 2013 at 12:48:51PM +, Tom wrote: 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

Re: [PATCH 1/2] transport-helper: report errors properly

2013-04-13 Thread Felipe Contreras
On Sat, Apr 13, 2013 at 1:00 AM, Jeff King p...@peff.net wrote: On Sat, Apr 13, 2013 at 12:42:29AM -0500, Felipe Contreras wrote: To me, the reality is obvious: my patch didn't require such a big commit message, the short version was fine, the only reason Jeff King insisted on a longer

Re: [PATCH 3/2] doc/http-backend: match query-string in apache half-auth example

2013-04-13 Thread Jakub Narębski
W dniu 13.04.2013 05:33, Jeff King pisze: When setting up a half-auth repository in which reads can be done anonymously but writes require authentication, it is best if the server can require authentication for both the ref advertisement and the actual receive-pack POSTs. [...] Thanks for

ARA 2013 ----- ECS 2013 (part of ARA 2013) ----- New Deadline for ECS 2013. Indexing in ISI, EI Compendex, SCOPUS, INSPEC (IET) etc... Publication of accepted papers in Journals or Chapters i

2013-04-13 Thread ARA 2013 (Advanced Research and Applications)
*ECS 2013* The 2013 International Conference on Electronics and Communication Systems July 16-19, 2013, Rhodes (Rodos) Island, Greece http://www.europment.org/conf2013/ecs.htm PUBLICATIONS: Extended Versions of Selected papers (about 40%) will be published in

Fwd: Re: git send-pack: protocol error: bad band #50

2013-04-13 Thread João Joyce
Hello, I have tried to remove and recreate my git folder and remove some files to get more logs. Here they are: packet: push capabilities^{}\0 report-status delete-refs side-band-64k quiet ofs-delta packet: push packet:

[PATCH v2 3/3] convert.c: Remove duplicate code

2013-04-13 Thread Lukas Fleischer
has_cr_in_index() is an almost 1:1 copy of read_blob_data_from_index_path() with some additions. Invoke read_blob_data_from_index_path() instead of using copy-pasted code. Signed-off-by: Lukas Fleischer g...@cryptocrack.de --- convert.c | 27 ++- 1 file changed, 2

[PATCH v2 1/3] Add public function read_blob_data_from_index_path()

2013-04-13 Thread Lukas Fleischer
* Make the read_index_data() function public, rename it to read_blob_data_from_index_path() and move it from attr.c to read-cache.c. * Add a use_index parameter to specify a custom index_state since we are no longer enable to access the static use_index variable from attr.c. This allows

[PATCH v2 2/3] Add size parameter to read_blob_data_from_index_path()

2013-04-13 Thread Lukas Fleischer
This allows for optionally getting the size of the returned data and will be used in a follow-up patch. Signed-off-by: Lukas Fleischer g...@cryptocrack.de --- attr.c | 2 +- cache.h | 2 +- read-cache.c | 5 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/attr.c

[PATCH v2] i18n: branch: mark strings for translation

2013-04-13 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Not mark BUG: impossible combination of %d and %p, which would never happen. branch.c | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff

Re: git instaweb - share all project files

2013-04-13 Thread Jakub Narębski
Please do not top-post. On 11.04.2013, Trenton D. Adams wrote: #1 would actually work. Though long term it would be cool to view it with all the most recent commit information, kind of like github does. You know, showing updated 4 days ago. On Wed, Apr 10, 2013 at 11:03 AM, Jakub

[PATCH] bisect: Store first bad commit as comment in log file

2013-04-13 Thread Torstein Hegge
When bisect successfully finds a single revision, the first bad commit should be shown to human readers of 'git bisect log'. This resolves the apparent disconnect between the bisection result and the log when a bug reporter says I know that the first bad commit is $rev, as you can see from $(git

[RFC/PATCH] clone: introduce clone.submoduleGitDir to relocate $GITDIR

2013-04-13 Thread Ramkumar Ramachandra
This configuration variable comes into effect when 'git clone' is invoked inside an existing git repository's worktree. When set, instead of cloning the given repository as-is, it relocates the gitdir of the repository to the path specified by this variable. This setting is especially useful

Re: git instaweb - share all project files

2013-04-13 Thread Eric Wong
Jakub Narębski jna...@gmail.com wrote: Unfortunately it turns out such simple solution doesn't really work. First, for some reason Firefox 20.0 refuses to follow file:/// link, even though it shows correctly worktree if copy'n'pasted as URL in new window / new tab. I can confirm this

[PATCH v2 0/3] Introduce pull.autostash

2013-04-13 Thread Ramkumar Ramachandra
I've been using this patch for some time now, and have to say that 'git pull' is much more useable now. The feature is turned off by default so that it doesn't break any existing tests. [1/3] and [2/3] are simple while we're there patches, that are unchanged from the last round. [3/3] is

[PATCH 1/3] pull: prefer invoking git command over git-command

2013-04-13 Thread Ramkumar Ramachandra
14e5d40c (pull: Fix parsing of -Xoption, 2010-01-17) added the lines containing git-push and git-merge, even though the prevelant style at the time was to use the unhyphenated git command form. Fix this. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- git-pull.sh | 4 ++-- 1 file

[PATCH 2/3] t5521 (pull-options): use test_commit() where appropriate

2013-04-13 Thread Ramkumar Ramachandra
test_commit() is a well-defined function in test-lib-functions.sh that allows you to create commits with a terse syntax. Prefer using it over creating commits by hand. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t5521-pull-options.sh | 4 ++-- 1 file changed, 2 insertions(+), 2

[PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

2013-04-13 Thread Ramkumar Ramachandra
Currently, executing a 'git pull' on a dirty worktree gives the following annoying message: # User doesn't notice dirty worktree $ git pull ... # fetch operation error: Your local changes to the following files would be overwritten by merge: quux Please, commit your

Re: git p4 submit failing

2013-04-13 Thread Pete Wyckoff
l...@diamand.org wrote on Thu, 11 Apr 2013 21:19 +0100: Just a thought, but check the files that are failing to see if they've got RCS keywords in them ($Id$, $File$, $Date$, etc). These cause all sorts of nasty problems. That's assuming it's definitely not a CRLF line ending problem on

Re: [ITCH] pull.default

2013-04-13 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I think you can shrink and enhance the above repertoire at the same time by separating do I want to have stash and stash pop around bit into an orthogonal axis. The other orthogonal axes are Under what condition do I integrate the work from the upstream? (e.g. only when

[PATCH] branch: colour upstream branches

2013-04-13 Thread Felipe Contreras
It's hard to see them among so much output otherwise. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 00d17d2..a1cdc29 100644