Re: commit-message attack for extracting sensitive data from rewritten Git history

2013-04-09 Thread Johannes Sixt
Am 4/8/2013 23:54, schrieb Jeff King: Yeah, it would make sense for filter-branch to have a --map-commit-ids option or similar that does the update. At first I thought it might take two passes, but I don't think it is necessary, as long as we traverse the commits topologically (i.e., you

Re: [PATCH 0/3] Using a bit more decoration

2013-04-09 Thread Jeff King
On Mon, Apr 08, 2013 at 09:54:50PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: The tricky part is how to store the index for each commit (or object). I don't see a way around adding a new field to struct commit to do so. We could reuse the space indegree used to live

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-09 Thread Jeremy Rosen
looking a little bit more into this, I was very suprised there seems to be little/no tools in the git ecosystem that studies the dependencies between commits based on the file they modified and/or the conflict they would cause. Is there any pre-existing tool to do that ? It can be done

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-09 Thread Ramkumar Ramachandra
Jeff King wrote: That is not actually a submodule, but rather just a repo that happens to be inside our working tree. I know the distinction is subtle, but according to the thread I linked to above, we may actually treat paths with gitlinked index entries separately already (I did not try it,

[PATCH 0/2] Fix git add with submodules

2013-04-09 Thread Ramkumar Ramachandra
Hi, git add has a bug when operating on submodules. The following test fails: mkdir submodule_dir ( cd submodule_dir git init cat foo -\EOF Some content EOF git add foo

[PATCH 1/2] t3700 (add): add two tests for testing add with submodules

2013-04-09 Thread Ramkumar Ramachandra
The first test git add should not go past gitlink boundaries checks that paths within a submodule added with 'git submodule add' cannot be added to the index. It passes because of treat_gitlink() in builtin/add.c. The second test git add should not go past git repository boundaries checks that

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

2013-04-09 Thread Ramkumar Ramachandra
Currently, git add has the logic for refusing to add gitlinks using treat_path(), which in turn calls check_path_for_gitlink(). However, this only checks for an in-index submodule (or gitlink cache_entry). A path inside a git repository in the worktree still adds fine, and this is a bug. The

***** SCSI 2013 ***** New Deadline for SCSI2013. Indexing in ISI, EI Compendex, SCOPUS, INSPEC (IET) etc... Publication of accepted papers in Journals or Chapters in Springer Verlag, World

2013-04-09 Thread Ara Viky Hanioti
*SCSI 2013* The 2013 International Conference on Systems, Control, Signal Processing and Informatics July 16-19, 2013, Rhodes (Rodos) Island, Greece http://www.europment.org/conf2013/scsi.htm PUBLICATIONS: Extended Versions of Selected papers (about 40%) will be

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

2013-04-09 Thread Jakub Narębski
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 j...@blackdown.de I see that this patch does (or tries to do) two _independent_ things, and

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-09 Thread Jakub Narębski
W dniu 08.04.2013 23:30, Jeff King pisze: On Mon, Apr 08, 2013 at 03:56:49PM +0530, Ramkumar Ramachandra wrote: git add currently goes past submodule boundaries. Document this bug. It's not just submodules, but we should not recurse into any sub-repository. If I have an unrelated Meta/

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

2013-04-09 Thread Jakub Narębski
Junio C Hamano wrote: Ramkumar Ramachandra wrote: 2. If we want to make git-submodule a part of git-core (which I think everyone agrees with), we will need to make the information in .gitmodules available more easily to the rest of git-core. Care to define more easily which is another

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-09 Thread Ramkumar Ramachandra
Jakub Narębski wrote: Hmmm... I used to do (and still do) such not-recommended thing, i.e. keeping git/gitweb/TODO etc. in git/gitweb/.git repository, while having git/gitweb/gitweb.perl in git/.git repository. Why don't you put the gitweb/TODO in a different branch in the git.git repository?

GnuPG commit signature verification ignores GPG's status-fd and status-file options

2013-04-09 Thread Not Sure
Starting with the newest git version 1.8.2.1, the signature checking code somehow ignores GPG's status-fd and status-file options, which are THE way to machine parse GPG's output (seee [1]) How to reproduce: 1. Put the following line in your ~/.gnupg/gpg.conf file: status-fd 1 2. Produce a

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

2013-04-09 Thread Jakub Narębski
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 I get stuck. The man-page for git-http-backend says that the

[PATCH] t/README: --immediate skips cleanup commands for failed tests

2013-04-09 Thread Simon Ruderich
On Sun, Apr 07, 2013 at 03:32:00PM -0700, Jonathan Nieder wrote: I'm not sure if it's better to use test_when_finished with rm or just rm -rf tmp at the end of the test in case someone wants to look at the output. test_when_finished is better here, since it means later tests can run and

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-09 Thread Jakub Narębski
On 09.04.2013, Ramkumar Ramachandra wrote: Jakub Narębski wrote: Hmmm... I used to do (and still do) such not-recommended thing, i.e. keeping git/gitweb/TODO etc. in git/gitweb/.git repository, while having git/gitweb/gitweb.perl in git/.git repository. Why don't you put the gitweb/TODO in

Re: [PATCH v4 1/6] send-email: make annotate configurable

2013-04-09 Thread Jakub Narębski
W dniu 07.04.2013 19:46, Felipe Contreras pisze: @@ -212,7 +212,8 @@ my %config_bool_settings = ( signedoffbycc = [\$signed_off_by_cc, undef], signedoffcc = [\$signed_off_by_cc, undef], # Deprecated validate = [\$validate, 1], -multiedit = [\$multiedit, undef] +

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-09 Thread Christian Couder
Hi, On Tue, Apr 9, 2013 at 10:55 AM, Jeremy Rosen jeremy.ro...@openwide.fr wrote: looking a little bit more into this, I was very suprised there seems to be little/no tools in the git ecosystem that studies the dependencies between commits based on the file they modified and/or the

Re: Teaching rerere about existing merges

2013-04-09 Thread Jed Brown
Jeremy Rosen jeremy.ro...@openwide.fr writes: is there a way to teach rerere about existing merge commits, or do I have to re-solve all the existing merge manually once ? See src/contrib/rerere-train.sh and Junio's blog.

Re: Teaching rerere about existing merges

2013-04-09 Thread Jeremy Rosen
thanks a lot, that solves my problem. I'm a bit suprised that it's not part of the git-rerere command but that's good enough for me... Cordialement Jérémy Rosen fight key loggers : write some perl using vim - Mail original - Jeremy Rosen jeremy.ro...@openwide.fr writes:

Re: GnuPG commit signature verification ignores GPG's status-fd and status-file options

2013-04-09 Thread Thomas Rast
Not Sure kue...@googlemail.com writes: Starting with the newest git version 1.8.2.1, the signature checking [...] Missing from output is the machine parsable GPG information: [GNUPG:] SIG_ID sorvifhoerui/asidunb 2013-04-09 23947273 [GNUPG:] GOODSIG 4338111324 User usermail [GNUPG:]

Re: [PATCH 4/4] gitweb: Fix broken blob action parameters on blob/commitdiff pages

2013-04-09 Thread Jakub Narębski
W dniu 08.04.2013 22:10, Jürgen Kreileder pisze: Fix broken blob action parameters on blobdiff and commitdiff pages by explicitly passing variables instead of relying on global ones. Do I understand it correctly that those variables (e.g. $hash variable in git_patchset_body in second chunk

Re: Teaching rerere about existing merges

2013-04-09 Thread Junio C Hamano
Jeremy Rosen jeremy.ro...@openwide.fr writes: is there a way to teach rerere about existing merge commits, or do I have to re-solve all the existing merge manually once ? There is a tool that does the re-solve manually for you. $ git ls-files | grep rerere-train contrib/rerere-train.sh It

Re: [PATCH] t3700 (add): add failing test for add with submodules

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 02:49:24PM +0530, Ramkumar Ramachandra wrote: On the wording issue, a submodule is a submodule whether in-index or otherwise. I would write two different tests: one for in-worktree submodule and another for in-index submodule, and name them appropriately. Does that

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

2013-04-09 Thread Aaron Schrab
At 17:24 -0700 08 Apr 2013, Jonathan Nieder jrnie...@gmail.com wrote: +test_expect_success 'clone using repo with gitfile as a reference' ' + git clone --separate-git-dir=L A M + git clone --reference=M A N What should happen if I pass --reference=M/.git? That isn't supported

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

2013-04-09 Thread Junio C Hamano
Aaron Schrab aa...@schrab.com writes: At 17:24 -0700 08 Apr 2013, Jonathan Nieder jrnie...@gmail.com wrote: +test_expect_success 'clone using repo with gitfile as a reference' ' + git clone --separate-git-dir=L A M + git clone --reference=M A N What should happen if I pass

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

2013-04-09 Thread Aaron Schrab
At 09:47 -0700 09 Apr 2013, Junio C Hamano ju...@pobox.com wrote: Aaron Schrab aa...@schrab.com writes: But if others disagree, I could be convinced to add support for that. If M/.git weren't a gitfile that points elsewhere, that request ought to work, no? A gitfile is the moral equilvalent

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

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 02:51:37PM +0530, Ramkumar Ramachandra wrote: Currently, git add has the logic for refusing to add gitlinks using treat_path(), which in turn calls check_path_for_gitlink(). However, this only checks for an in-index submodule (or gitlink cache_entry). A path inside a

Re: commit-message attack for extracting sensitive data from rewritten Git history

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 08:03:24AM +0200, Johannes Sixt wrote: Am 4/8/2013 23:54, schrieb Jeff King: Yeah, it would make sense for filter-branch to have a --map-commit-ids option or similar that does the update. At first I thought it might take two passes, but I don't think it is

gitweb commitdiff page - binary files with ampersands in filename?

2013-04-09 Thread Oj W
Change a binary file whose filename contains an ampersand, then view the commitdiff page in gitweb. Git outputs a message like Binary files a/bw.dll and b/bw.dll differ Gitweb format_diff_from_to_header() doesn't notice anything in that output which needs escaping, and writes it directly to the

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

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, git add has the logic for refusing to add gitlinks using treat_path(), which in turn calls check_path_for_gitlink(). However, this only checks for an in-index submodule (or gitlink cache_entry). A path inside a git repository in the

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

2013-04-09 Thread Jeff King
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 read and write. Then I get stuck. The man-page for

Re: segfault in git-remote-http

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 08:47:18AM -0700, rh wrote: The symptoms that this patch addresses look similar: http://article.gmane.org/gmane.mail.postfix.user/217790 Quote from that thread: This behavior is actually documented (SSL_set_fd() destroys a BIO already on the SSL handle, and

Re: segfault in git-remote-http

2013-04-09 Thread Daniel Stenberg
On Tue, 9 Apr 2013, Jeff King wrote: git-remote-http does not touch the openssl code itself at all. We only talk to curl, which handles all of the ssl (and may even be built on gnutls). So if that is the problem, then I think it may be a libcurl bug, not a git one. ... and if/when you do

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Jeff King wrote: So you would need some heuristics based on whether something was a valid refspec, or could be a valid remote name or URL. All refspecs conform to a very simple format: quux +quux quux:baz +quux:baz All of

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

2013-04-09 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Ramkumar Ramachandra artag...@gmail.com writes: Currently, git add has the logic for refusing to add gitlinks using treat_path(), which in turn calls check_path_for_gitlink(). However, this only checks for an in-index submodule (or gitlink

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Ramkumar Ramachandra
Junio C Hamano wrote: host:foo/bar (take my host branch, push it to their foo/bar branch) could be tricky, no? It could be trying to go over the ssh to host and access repository at $HOME/foo/bar. The git_connect() call may even succeed and you cannot use the failure as a hint to

Re: [PATCH 2/4] gitweb: Make feed title valid utf8

2013-04-09 Thread Jürgen Kreileder
Jakub Narębski jna...@gmail.com writes: Jürgen Kreileder wrote: Properly encode site and project names for RSS and Atom feeds. Signed-off-by: Jürgen Kreileder j...@blackdown.de --- gitweb/gitweb.perl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2013-04-09 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I looked at the output from grep has_symlink_leading_path and also for die_if_path_beyond; all of these places are checking I have this multi-level path; I want to know if the path does not (should not) be part of the current project, I think.

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

2013-04-09 Thread Ramkumar Ramachandra
Junio C Hamano wrote: The first step (renaming and adjusting comments) would look like this. Thanks for this! I like the name die_if_path_outside_our_project(). I'll take care of the rest.` -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: segfault in git-remote-http

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 10:41:34AM -0700, rh wrote: git-remote-http does not touch the openssl code itself at all. We only talk to curl, which handles all of the ssl (and may even be built on gnutls). So if that is the problem, then I think it may be a libcurl bug, not a git one.

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

2013-04-09 Thread Junio C Hamano
Sorry for repeated rerolls. I had missed another instance in t0008 and also the explanation was lacking. -- 8 -- Subject: [PATCH] symlinks: rename has_symlink_leading_path() to path_outside_our_project() The purpose of the function is to prevent a path from getting added to our project when

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

2013-04-09 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I think what the callers of this function care about is if the name is a path that should not be added to our index (i.e. points outside the repository). If you had a symlink d that points at e when our project does have a subdirectory e with file f,

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: host:foo/bar (take my host branch, push it to their foo/bar branch) could be tricky, no? It could be trying to go over the ssh to host and access repository at $HOME/foo/bar. The git_connect() call may even succeed and

Re: [PATCH 3/4] gitweb: Don't append ';js=(0|1)' to external links

2013-04-09 Thread Jakub Narębski
W dniu 09.04.2013 19:54, Jürgen Kreileder napisał: Jakub Narębski jna...@gmail.com writes: Jürgen Kreileder wrote: Don't add js parameters to links outside of gitweb itself. Hmmm... this limits adding ';js=(0|1)' to only links which begin with $my_url, i.e. absolute links beginning with

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Ramkumar Ramachandra
Junio C Hamano wrote: What is bad about saying push origin ...the rest...? I don't know which remote to push to: all I know is that the remote to push to is configured somewhere in the web of branch.remote, remote.pushdefault, and branch.name.pushremote, and I don't want to have to figure that

Re: commit-message attack for extracting sensitive data from rewritten Git history

2013-04-09 Thread Roberto Tyley
On 9 April 2013 18:01, Jeff King p...@peff.net wrote: On Tue, Apr 09, 2013 at 08:03:24AM +0200, Johannes Sixt wrote: If A mentions B (think of cherry-pick -x), then you must ensure that the branch containing B was traversed first. Yeah, you're right. Multiple passes are necessary to get it

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: [...] Let's not do anything too complex, and just aim for a more pleasant experience for the simple case of force-pushing some refs without the :dst counterpart. Then, all we have to do is verify that what is specified is not a valid remote, and is not a valid local

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

2013-04-09 Thread Ramkumar Ramachandra
Junio C Hamano wrote: But there are other cases to attempt to add a path that do not belong to our project, which do not have to involve a symbolic link in the leading path. The reader is now wondering what this could possibly be, and why you didn't send this patch earlier. Perhaps clarify

Re: [PATCH 2/4] gitweb: Make feed title valid utf8

2013-04-09 Thread Jakub Narębski
W dniu 09.04.2013 19:40, Jürgen Kreileder napisał: Jakub Narębski jna...@gmail.com writes: Jürgen Kreileder wrote: Properly encode site and project names for RSS and Atom feeds. - my $title = $site_name - $project/$action; + my $title = to_utf8($site_name) . - . to_utf8($project) .

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

2013-04-09 Thread Jakub Narębski
W dniu 09.04.2013 19:34, Junio C Hamano pisze: - if (has_symlink_leading_path(path, len)) - return error('%s' is beyond a symbolic link, path); + if (path_outside_our_project(path, len)) + return error('%s' is outside our working tree, path); Don't we lose

Re: git-am doesn't apply the rest of the email after a partial patch fail?

2013-04-09 Thread Constantine A. Murenin
On 8 April 2013 10:49, Junio C Hamano gits...@pobox.com wrote: Constantine A. Murenin muren...@gmail.com writes: However, what I've faced with, is that when a conflict happens, and I resolve, and do `git add`, and `git am --resolved`, then the rest of the `format-patch` email where the

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

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: I think what the callers of this function care about is if the name is a path that should not be added to our index (i.e. points outside the repository). If you had a symlink d that points at e when our project does have

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

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: The reader is now wondering what this could possibly be, and why you didn't send this patch earlier. Because it wasn't written back then? Perhaps clarify with: s/there are cases/there may be cases/ and append One such case that we currently

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

2013-04-09 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: W dniu 09.04.2013 19:34, Junio C Hamano pisze: -if (has_symlink_leading_path(path, len)) -return error('%s' is beyond a symbolic link, path); +if (path_outside_our_project(path, len)) +return error('%s' is outside our

Re: git-am doesn't apply the rest of the email after a partial patch fail?

2013-04-09 Thread Junio C Hamano
Constantine A. Murenin muren...@gmail.com writes: Well, I now know this, but it wasn't clear from the documentation that that was the behaviour. Yes, the message after you _resolved_, please tell me you are now done is too fuzzy. What it wants to say is: I punted, because the patch

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

2013-04-09 Thread Jakub Narębski
Junio C Hamano wrote: Jakub Narębski jna...@gmail.com writes: W dniu 09.04.2013 19:34, Junio C Hamano pisze: - if (has_symlink_leading_path(path, len)) - return error('%s' is beyond a symbolic link, path); + if (path_outside_our_project(path, len)) + return

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

2013-04-09 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Ramkumar Ramachandra artag...@gmail.com writes: The reader is now wondering what this could possibly be, and why you didn't send this patch earlier. Because it wasn't written back then? Perhaps clarify with: s/there are cases/there may be cases/

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

2013-04-09 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: Junio C Hamano wrote: Jakub Narębski jna...@gmail.com writes: W dniu 09.04.2013 19:34, Junio C Hamano pisze: - if (has_symlink_leading_path(path, len)) - return error('%s' is beyond a symbolic link, path); + if

Re: [PATCH] t/README: --immediate skips cleanup commands for failed tests

2013-04-09 Thread Junio C Hamano
Simon Ruderich si...@ruderich.org writes: On Sun, Apr 07, 2013 at 03:32:00PM -0700, Jonathan Nieder wrote: I'm not sure if it's better to use test_when_finished with rm or just rm -rf tmp at the end of the test in case someone wants to look at the output. test_when_finished is better here,

Re: [PATCH 2/4] gitweb: Make feed title valid utf8

2013-04-09 Thread Jürgen Kreileder
Jakub Narębski jna...@gmail.com writes: W dniu 09.04.2013 19:40, Jürgen Kreileder napisał: Jakub Narębski jna...@gmail.com writes: Jürgen Kreileder wrote: Properly encode site and project names for RSS and Atom feeds. - my $title = $site_name - $project/$action; + my $title =

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: What is bad about saying push origin ...the rest...? I don't know which remote to push to: all I know is that the remote to push to is configured somewhere in the web of ... Ahh, and then the recent triangular stuff makes

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

2013-04-09 Thread René Scharfe
Am 08.04.2013 23:05, schrieb Jeff King: On Mon, Apr 08, 2013 at 02:36:05PM -0400, BJ Hargrave wrote: 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

Locating merge that dropped a change

2013-04-09 Thread Kevin Bracey
This morning, I was struggling (not for the first time) to produce a Git command that would identify a merge commit that dropped a change. I could see where it was added, but couldn't automate finding out why it wasn't any longer in HEAD. All the permutations of --full-history, -m, -S, -G on

Re: [PATCH 2/4] gitweb: Make feed title valid utf8

2013-04-09 Thread Jakub Narębski
W dniu 09.04.2013 21:22, Jürgen Kreileder napisał: Jakub Narębski jna...@gmail.com writes: W dniu 09.04.2013 19:40, Jürgen Kreileder napisał: Jakub Narębski jna...@gmail.com writes: Jürgen Kreileder wrote: Properly encode site and project names for RSS and Atom feeds. Good point. But it

Re: [PATCH 0/3] Using a bit more decoration

2013-04-09 Thread Junio C Hamano
Jeff King p...@peff.net writes: +static inline int *slab_at(struct commit_slab *s, const struct commit *c) +{ + if (s-alloc = c-index) { + int new_alloc = alloc_nr(s-alloc); + if (new_alloc = c-index) + new_alloc = c-index + 1; + +

Re: [PATCH 4/4] gitweb: Fix broken blob action parameters on blob/commitdiff pages

2013-04-09 Thread Jürgen Kreileder
Jakub Narębski jna...@gmail.com writes: W dniu 08.04.2013 22:10, Jürgen Kreileder pisze: Fix broken blob action parameters on blobdiff and commitdiff pages by explicitly passing variables instead of relying on global ones. Do I understand it correctly that those variables (e.g. $hash

[PATCH v2 0/2] submodule: drop the top-level requirement

2013-04-09 Thread John Keeping
Since version 1, patch 1 has been completely re-written using the approach proposed by Jonathan and Junio. Also, there's now a documentation update and some tests. John Keeping (2): rev-parse: add --filename-prefix option submodule: drop the top-level requirement

[PATCH v2 1/2] rev-parse: add --filename-prefix option

2013-04-09 Thread John Keeping
This adds a prefix string to any filename arguments encountered after it has been specified. Signed-off-by: John Keeping j...@keeping.me.uk --- Documentation/git-rev-parse.txt | 16 builtin/rev-parse.c | 24 --- t/t1513-rev-parse-prefix.sh | 90

[PATCH v2 2/2] submodule: drop the top-level requirement

2013-04-09 Thread John Keeping
Use the new rev-parse --prefix option to process all paths given to the submodule command, dropping the requirement that it be run from the top-level of the repository. Signed-off-by: John Keeping j...@keeping.me.uk --- git-submodule.sh | 7 +++ t/t7400-submodule-basic.sh | 26

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

2013-04-09 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: But there are other cases to attempt to add a path that do not belong to our project, which do not have to involve a symbolic link in the leading path. The reader is now wondering what this could possibly be, and why you

git-archive --worktree-attributes (1.8.2)

2013-04-09 Thread Amit Bakshi
Hi, In the help for git-archive it states: --worktree-attributes Look for attributes in .gitattributes in working directory too. This doesn't seem to be the case. I have a use case where I need to archive a remote I don't have write access too (via --remote=), and I wish to

Re: [PATCH v2 1/2] rev-parse: add --filename-prefix option

2013-04-09 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: This adds a prefix string to any filename arguments encountered after it has been specified. Signed-off-by: John Keeping j...@keeping.me.uk --- Stale subject? +--prefix arg:: + Behave as if 'git rev-parse' was invoked from the `arg` +

Re: [PATCH v2 2/2] submodule: drop the top-level requirement

2013-04-09 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: + eval set $(git rev-parse --sq --prefix $wt_prefix -- $@) This may be handier than having to do the for arg loop git-am uses yourself. ( git ls-files --error-unmatch --stage -- $@ || echo unmatched pathspec

Re: git-archive --worktree-attributes (1.8.2)

2013-04-09 Thread Junio C Hamano
Amit Bakshi ambak...@gmail.com writes: Hi, In the help for git-archive it states: --worktree-attributes Look for attributes in .gitattributes in working directory too. ... The worktree-attributes should read from the worktree. It should not pay any attention to where

Re: [PATCH v2 1/2] rev-parse: add --filename-prefix option

2013-04-09 Thread John Keeping
On Tue, Apr 09, 2013 at 01:57:21PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: This adds a prefix string to any filename arguments encountered after it has been specified. Signed-off-by: John Keeping j...@keeping.me.uk --- Stale subject? Yep. Sorry.

Re: [PATCH v2 2/2] submodule: drop the top-level requirement

2013-04-09 Thread John Keeping
On Tue, Apr 09, 2013 at 02:00:52PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: + eval set $(git rev-parse --sq --prefix $wt_prefix -- $@) This may be handier than having to do the for arg loop git-am uses yourself. ( git ls-files

Re: [PATCH v2 1/2] rev-parse: add --filename-prefix option

2013-04-09 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: It's not guessing on all of $@ in git-submodule - we know that everything left is a path. OK, then. -- 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

Re: [PATCH v4] transport-helper: report errors properly

2013-04-09 Thread Thomas Rast
Felipe Contreras felipe.contre...@gmail.com writes: If a push fails because the remote-helper died (with fast-export), the user won't see any error message. So let's add one. At the same time lets add tests to ensure this error is reported, and while we are at it, check the error from

[PATCH v2] t/README: --immediate skips cleanup commands for failed tests

2013-04-09 Thread Simon Ruderich
Signed-off-by: Simon Ruderich si...@ruderich.org --- On Tue, Apr 09, 2013 at 12:16:56PM -0700, Junio C Hamano wrote: Sign-off? Sorry, forgot it. Perhaps adding ... to keep the state for inspection by the tester to diagnose the bug or something is in order? Good idea. Revised patch is

Re: [PATCH v4] transport-helper: report errors properly

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 11:38:05PM +0200, Thomas Rast wrote: Two out of six of these loops quit within 1 and 2 iterations, respectively, both with an error along the lines of: expecting success: (GIT_REMOTE_TESTGIT_FAILURE=1 export GIT_REMOTE_TESTGIT_FAILURE

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

2013-04-09 Thread Jürgen Kreileder
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 j...@blackdown.de I see that this patch does (or

Re: [PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

2013-04-09 Thread John Koleszar
On Mon, Apr 8, 2013 at 2:45 PM, Jeff King p...@peff.net wrote: On Mon, Apr 08, 2013 at 11:25:39PM +0200, Thomas Rast wrote: At the risk of repeating something that's been said already -- I only skimmed the thread -- this test breaks in today's pu on my machine. I get: [...] --- expect

[PATCH v3 0/2] Using gitfile repository with clone --reference

2013-04-09 Thread Aaron Schrab
Here's the third version of my series for dealing with gitfiles in clone --reference. The first patch is unchanged from the previous version except for the addition of a Reviewed-by line. The second patch has been modified so that it now supports having a .git file supplied as the argument to

[PATCH v3 1/2] clone: Fix error message for reference repository

2013-04-09 Thread Aaron Schrab
Do not report that an argument to clone's --reference option is not a local directory. Nothing checks for the existence or type of the path as supplied by the user; checks are only done for particular contents of the supposed directory, so we have no way to know the status of the supplied path.

[PATCH v3 2/2] clone: Allow repo using gitfile as a reference

2013-04-09 Thread Aaron Schrab
Try reading gitfile files when processing --reference options to clone. This will allow, among other things, using a submodule checked out with a recent version of git as a reference repository without requiring the user to have internal knowledge of submodule layout. Signed-off-by: Aaron Schrab

write() _will_ fail on Mac OS X/XNU if nbytes INT_MAX

2013-04-09 Thread Filipe Cabecinhas
Hi all, While “git svn fetch”ing a subversion repository (private, sorry), I've encoutered a bug that appears in several git versions (always with the same symptoms): git from master (from 2013-04-08) git version 1.8.2.1 (compiled from homebrew) git version 1.7.12.4 (Apple Git-37) The only

Re: [PATCH v3 0/2] Using gitfile repository with clone --reference

2013-04-09 Thread Junio C Hamano
Aaron Schrab aa...@schrab.com writes: Here's the third version of my series for dealing with gitfiles in clone --reference. The first patch is unchanged from the previous version except for the addition of a Reviewed-by line. The second patch has been modified so that it now supports

Re: write() _will_ fail on Mac OS X/XNU if nbytes INT_MAX

2013-04-09 Thread Junio C Hamano
Filipe Cabecinhas fil...@gmail.com writes: Testing with dd bs=INT_MAX+1 count=1 also gets me an “Invalid argument” error, while bs=INT_MAX will do what's expected. I have a preliminary patch that fixes it, but it may not be the preferred way. The code is not ifdef'ed out and I'm doing the

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

2013-04-09 Thread 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, ... + if (!fp) + die(_(Could not

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Jonathan Nieder
Junio C Hamano wrote: And I think now I agree that indeed is a sensible assumption. I am not sure '-' is a good token for that, but I do not offhand think of a reason why '-' would be a _bad_ token for that, either. Random idea: today you can do git push origin master; # push branch

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Jonathan Nieder
Jonathan Nieder wrote: 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 Pretend I said fetch. ;-) -- To unsubscribe from this list: send the line unsubscribe git in the

[PATCH v4] http-backend: respect GIT_NAMESPACE with dumb clients

2013-04-09 Thread John Koleszar
Filter the list of refs returned via the dumb HTTP protocol according to the active namespace, consistent with other clients of the upload-pack service. Signed-off-by: John Koleszar jkoles...@google.com --- Updates to generate HEAD. Drops my original tests, since they were under the flawed

Re: [PATCH v4] http-backend: respect GIT_NAMESPACE with dumb clients

2013-04-09 Thread Junio C Hamano
Thanks; will replace the previous one that has been in 'pu'. -- 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: [ITCH] Specify refspec without remote

2013-04-09 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: And I think now I agree that indeed is a sensible assumption. I am not sure '-' is a good token for that, but I do not offhand think of a reason why '-' would be a _bad_ token for that, either. Random idea: today you can do

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Jeff King
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 --multiple today? My git does not

Re: [ITCH] Specify refspec without remote

2013-04-09 Thread Jeff King
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 would not come into play in this

Re: [PATCH v4] http-backend: respect GIT_NAMESPACE with dumb clients

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 05:55:08PM -0700, John Koleszar wrote: Filter the list of refs returned via the dumb HTTP protocol according to the active namespace, consistent with other clients of the upload-pack service. Thanks, this version looks good to me. Updates to generate HEAD. Drops my

Re: segfault in git-remote-http

2013-04-09 Thread Jeff King
On Tue, Apr 09, 2013 at 12:40:44PM -0700, rh wrote: does not support hardlinks or symlinks). But I'm not sure which error you are talking about. We can figure out inside the program which program was invoked by checking argv, but I do not see us printing remote-http anywhere. I wasn't

regression: 96b9e0e3 config: treat user and xdg config permission problems as errors busted git-daemon

2013-04-09 Thread Mike Galbraith
Greetings, I use git-daemon as the keeper of all source (love it). git is a normal user, running as git:daemon, with all repositories living in ~git. git-daemon is started like so: /usr/lib/git/git-daemon --syslog --detach --reuseaddr --user=git --group=daemon

  1   2   >