[PATCH 04/10] obstack: fix spelling of similar

From: Stefano Lattarini Date: Fri, 12 Apr 2013 00:36:10 +0200 Noticed using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder --- Would it be more useful to fix this in glibc and import from there? compat/obstack.h | 2 +- 1 file changed, 1 ins

[PATCH 03/10] contrib/subtree: fix spelling of accidentally

From: Stefano Lattarini Date: Fri, 12 Apr 2013 00:36:10 +0200 Noticed with Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder --- contrib/subtree/t/t7900-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtr

[PATCH 02/10] git-remote-mediawiki: spelling fixes

From: Stefano Lattarini Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: Eric Sunshine Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder --- contrib/mw-to-git/git-remote-m

[PATCH 01/10] doc: various spelling fixes

From: Stefano Lattarini Date: Fri, 12 Apr 2013 00:36:10 +0200 Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder --- I like this one. Documentation/git-credential.txt | 2 +- Documentation/git-remote-e

[RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros

Hi, Junio C Hamano wrote: > How much of this stuff have interact with real changes that are in > flight, with various doneness cooking in different integration > branches? All except the t3511-cherry-pick-x.sh change apply cleanly to "maint" and merge without trouble with master and pu. Here is

[PATCH] Documentation: distinguish between ref and offset deltas in pack-format

eb32d236 introduced the OBJ_OFS_DELTA object that uses a relative offset to identify the base object instead of the 20-byte SHA1 reference. The pack file documentation only mentions the SHA1 based reference in its description of the deltified object entry. Update the pack format documentation to c

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

On Fri, 2013-04-12 at 01:05 -0400, Jeff King wrote: > On Thu, Apr 11, 2013 at 09:46:35PM -0700, Junio C Hamano wrote: > > > >> --user:: > > >> ... current description ... > > >> + > > >> (Like|Unlike) many programs that let you run programs as > > >> specified user, the daemon do

Re: Fixing typos

I re-submitted it. Thank you, Ramkumar. On 04/11/2013 05:14 AM, Ramkumar Ramachandra wrote: Benoit Bourbie wrote: I apologize for being picky There's nothing to apologize for. These are good catches worth fixing. but that patch fixes 3 typos. Please read Documentation/SubmittingPatche

[PATCH] Typo fix: replacing it's -> its

Signed-off-by: Benoit Bourbie --- INSTALL | 2 +- perl/private-Error.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 2dc3b61..ba01e74 100644 --- a/INSTALL +++ b/INSTALL @@ -101,7 +101,7 @@ Issues of note: - "openssl" librar

[PATCH] Fixing typos

Very basic documentation typo fixes. Benoît Bourbié (1): Typo fix: replacing it's -> its INSTALL | 2 +- perl/private-Error.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.8.2.470.g21ccebe.dirty -- To unsubscribe from this list: send the line "unsubscribe g

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

On Thu, Apr 11, 2013 at 09:46:35PM -0700, Junio C Hamano wrote: > >> --user:: > >>... current description ... > >> + > >> (Like|Unlike) many programs that let you run programs as > >> specified user, the daemon does not reset environment variables > >> such as $HOME when it

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

Jeff King writes: > On Thu, Apr 11, 2013 at 09:11:20PM -0700, Junio C Hamano wrote: > >> The --user option to git-daemon would be a good place to do that, I >> think. Depending on what other "setuid to less privileged before >> running" programs do (I do not know offhand), we can say something >

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

On Thu, Apr 11, 2013 at 09:11:20PM -0700, Junio C Hamano wrote: > The --user option to git-daemon would be a good place to do that, I > think. Depending on what other "setuid to less privileged before > running" programs do (I do not know offhand), we can say something > like this perhaps? That'

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

"W. Trevor King" writes: > On Thu, Apr 11, 2013 at 06:23:01PM -0400, Jeff King wrote: > ... >> I think the point is that it could add >> >> ...and I was looking in /root, because that is where your HOME points. >> Shouldn't you be able to read your own HOME directory? >> >> which should mak

[PATCH v2] i18n: make the translation of -u advice in one go

The advice (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. S

Re: [PATCH] i18n: make the translation of -u advise in one go

Hi, Jiang Xin wrote: > Since status_vprintf() called by status_printf_ln() can handle eol in > buffer, we could simply join these lines into one paragraph. Good idea. [...] > --- a/wt-status.c > +++ b/wt-status.c > @@ -1223,16 +1223,12 @@ void wt_status_print(struct wt_status *s) >

Re: [PATCH] i18n: make the translation of -u advise in one go

On Thu, Apr 11, 2013 at 10:46 PM, Jiang Xin wrote: > i18n: make the translation of -u advise in one go s/advise/advice/ > The advise (consider use of -u when read_directory takes too long) is Ditto: s/advise/advice/ > separated into 3 different status_printf_ln() calls, and which brings > trou

[PATCH] i18n: make the translation of -u advise in one go

The advise (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. S

Re: [PATCH v3 5/5] Documentation: add caveats about I/O buffering for check-{attr,ignore}

Adam Spiers writes: > On Thu, Apr 11, 2013 at 11:09:28AM -0700, Junio C Hamano wrote: >> Reflowing of the text is very much unappreciated X-<. > > I very much appreciate the excellent job you do as maintainer; your > attention to detail results in an incredibly high quality project. > However I

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

On Thu, Apr 11, 2013 at 06:23:01PM -0400, Jeff King wrote: > On Thu, Apr 11, 2013 at 03:20:46PM -0700, Junio C Hamano wrote: > > "W. Trevor King" writes: > > > The difficulty was figuring out why the daemon was dying in > > > the first place (which involved bisection for me as well). Maybe > > >

Re: [PATCH v2] Fix various typos and grammaros

Stefano Lattarini writes: > Documentation/git-credential.txt | 2 +- > Documentation/git-remote-ext.txt | 2 +- > Documentation/git-svn.txt | 4 ++-- > Documentation/git-tools.txt| 2 +- > Documentation/revi

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

On 04/11/2013 07:37 PM, Jonathan Nieder wrote: Hello, João Joyce wrote: I am not sure this is the right place to ask this. You're in the right place. [...] I am trying to push some files to a server with git push. I have configured the server to push the files: git remote set-url test

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

Felipe Contreras writes: > And if you must, you might was well label them with "REMINDER", no, > wait, that's what "TODO" comments are for, where people can see them, > and not *forget* them. Yeah, good point. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Re: [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin

On Thu, Apr 11, 2013 at 05:04:30PM -0400, Aaron Schrab wrote: > At 13:05 +0100 11 Apr 2013, Adam Spiers wrote: > >The above use case suggests that empty STDIN is actually a reasonable > >scenario (e.g. when the caller doesn't know in advance whether any > >queries need to be fed to the background

[PATCH v2] Fix various typos and grammaros

Most typos suggested by codespell: Grammaros pointed out by Eric Sunshine. Helped-by: Eric Sunshine Signed-off-by: Stefano Lattarini --- Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt |

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

On Thu, Apr 11, 2013 at 03:20:46PM -0700, Junio C Hamano wrote: > "W. Trevor King" writes: > > > As one of the less experienced folks tripped up by this issue, I think > > that setting HOME explicitly before invoking the daemon is simple > > enough (which is why I just fixed my invocation and di

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

"W. Trevor King" writes: > As one of the less experienced folks tripped up by this issue, I think > that setting HOME explicitly before invoking the daemon is simple > enough (which is why I just fixed my invocation and didn't post to the > list). Sounds like we need a documentation update somew

[PATCH] git-cherry.txt: cross reference "git log --cherry"

I learned of "git cherry" some days ago, but only learned of --cherry and related options to "git log" today (more-or-less by chance). If the git-cherry(1) manpage had mentioned --cherry, I would have learned of these options sooner. Signed-off-by: Samuel Bronson --- Documentation/git-cherry.tx

Re: [PATCH] Various typofixes

On Thu, Apr 11, 2013 at 4:55 PM, Stefano Lattarini wrote: > Mostly suggested by codespell > > Signed-off-by: Stefano Lattarini > --- > diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c > index 8c96ed9..aab8153 100644 > --- a/compat/regex/reg

Re: [ITCH] Specify refspec without remote

Ramkumar Ramachandra writes: > Let us imagine that origin points to git/git.git (upstream), ram > points to artagnon/git.git and peff points to peff/git.git. I fork > off from upstream and have various local branches that only have > corresponding refs in ram (say implicit-push). Then, you fork

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

On Thu, Apr 11, 2013 at 1:49 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Thu, Apr 11, 2013 at 11:59 AM, Jeff King wrote: >> >>> But I give up on you. I find most of your commit messages lacking in >>> details and motivation, making assumptions that the reader is as >>> familiar

BUG: git filter-branch does not make tree replacements permanent

Hi, The git filter-branch man page states: NOTE: This command honors .git/info/grafts and .git/refs/replace/. If you have any grafts or replacement refs defined, running this command will make them permanent. However the command does not seem to honor tree (or blob) objects

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

On Thu, Apr 11, 2013 at 1:44 PM, Junio C Hamano wrote: > Felipe Contreras writes: >>> In the long run, it may make more sense to propagate the >>> error back up to push, so that it can present the usual >>> status table and give a nicer message. But this is a much >>> simpler fix that can help i

Re: [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin

At 13:05 +0100 11 Apr 2013, Adam Spiers wrote: The above use case suggests that empty STDIN is actually a reasonable scenario (e.g. when the caller doesn't know in advance whether any queries need to be fed to the background process until after it's already started), so we make the minor behavio

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

On Thu, Apr 11, 2013 at 12:54:34PM -0700, Junio C Hamano wrote: > I also have a suspicion that your patch makes things worse for > people who are more adept at these issues around running daemons > than the people who introduced this problem in the first place (eh, > that's "us")… > > A trade off

[PATCH] Various typofixes

Mostly suggested by codespell Signed-off-by: Stefano Lattarini --- Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Do

Re: [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin

On Thu, Apr 11, 2013 at 09:31:41PM +0100, Adam Spiers wrote: > The shell source is strong with this one ;-) > > Congrats - I first tried with FIFOs (hence my other patch which moves > the PIPE test prerequisite definition into the core framework - the > original intention was to reuse it here) bu

Re: [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin

On Thu, Apr 11, 2013 at 03:11:32PM -0400, Jeff King wrote: > I always get a little nervous with sleeps in the test suite, as they are > indicative that we are trying to avoid some race condition, which means > that the test can fail when the system is under load, or when a tool > like valgrind is u

Re: git p4 submit failing

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 Windows. On Thu, Apr 11, 2013 at 8:01 PM, Christopher Yee Mon wr

[PATCH v3 5/5] Documentation: add caveats about I/O buffering for check-{attr,ignore}

On Thu, Apr 11, 2013 at 11:09:28AM -0700, Junio C Hamano wrote: > Reflowing of the text is very much unappreciated X-<. I very much appreciate the excellent job you do as maintainer; your attention to detail results in an incredibly high quality project. However I do occasionally find your commu

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

On Thu, Apr 11, 2013 at 12:54:34PM -0700, Junio C Hamano wrote: > > I could go either way. I think 96b9e0e is the right thing to do > > conceptually, but I kind of doubt it was affecting all that many people. > > And though it's _possible_ for it to be a security problem, I find it > > much more l

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

Jeff King writes: > On Thu, Apr 11, 2013 at 11:11:03AM -0700, Jonathan Nieder wrote: > >> > -- >8 -- >> > Subject: [PATCH] daemon: set HOME when we switch to --user >> >> Thanks for taking care of it. For what it's worth, >> >> Acked-by: Jonathan Nieder >> >> I'm not sure whether to keep 96b

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

On Thu, Apr 11, 2013 at 08:52:56AM +0200, Magnus Therning wrote: > > The documentation should probably make the use of http.receivepack more > > clear in this situation. > > I think that'd be good. The fact that it wasn't until several mails > into the thread that anyone thought of the http.rece

Re: Locating merge that dropped a change

Kevin Bracey writes: > I think I've found the problem. It only doesn't work _if you specify > the file_. > > Specifically, if I was missing an addition, my first attempt to find > it would be > > git log -p -m -S > > If the addition was lost in a merge, that doesn't even show the > addition, w

Re: [PATCH] t9903: Don't fail when run from path accessed through symlink

On Thu, Apr 11, 2013 at 08:53:22PM +0200, Torstein Hegge wrote: > When the git directory is accessed through a symlink like > > ln -s /tmp/git /tmp/git-symlink > cd /tmp/git-symlink/t > make -C .. && ./t9903-bash-prompt.sh > > $TRASH_DIRECTORY is /tmp/git-symlink/t/trash directory.t9903-ba

[PATCH] t9903: Don't fail when run from path accessed through symlink

When the git directory is accessed through a symlink like ln -s /tmp/git /tmp/git-symlink cd /tmp/git-symlink/t make -C .. && ./t9903-bash-prompt.sh $TRASH_DIRECTORY is /tmp/git-symlink/t/trash directory.t9903-bash-prompt and $(pwd -P) is /tmp/git/t/trash directory.t9903-bash-prompt. When

Re: [PATCH v2 4/5] check-ignore: allow incremental streaming of queries via --stdin

On Thu, Apr 11, 2013 at 01:05:12PM +0100, Adam Spiers wrote: > +test_expect_success 'setup: have stdbuf?' ' > + if which stdbuf >/dev/null 2>&1 > + then > + test_set_prereq STDBUF > + fi > +' > + > +test_expect_success STDBUF 'streaming support for --stdin' ' > + ( > +

git p4 submit failing

I tried running git p4 submit on a repo that I've been running as an interim bridge between git and perforce. Multiple people are using the repo as a remote and its being periodically submitted back to perforce. It's been working mostly fine. Then one day out of the blue I get this error. I can no

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

Felipe Contreras writes: > On Thu, Apr 11, 2013 at 11:59 AM, Jeff King wrote: > >> But I give up on you. I find most of your commit messages lacking in >> details and motivation, making assumptions that the reader is as >> familiar with the code when reading the commit as you are when you wrote

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

Felipe Contreras writes: > On Wed, Apr 10, 2013 at 4:15 PM, Jeff King wrote: >> From: Felipe Contreras >> >> If a push fails because the remote-helper died (with >> fast-export), the user does not see any error message. We do I agree with you that s/does not see/may not see/ would be more help

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

Ramkumar Ramachandra writes: > Jens Lehmann wrote: >> When moving a submodule which uses a gitfile to point to the git directory >> stored in .git/modules/ of the superproject two changes must be made >> to make the submodule work: the .git file and the core.worktree setting >> must be adjusted t

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

Hello, João Joyce wrote: > I am not sure this is the right place to ask this. You're in the right place. [...] > I am trying to push some files to a server with git push. I have > configured the server to push the files: > git remote set-url test ssh://u...@location.com:2200/fullpath/ > > b

Re: [PATCH 1/5] check-ignore: move setup into cmd_check_ignore()

On Thu, Apr 11, 2013 at 12:05:11PM +0100, Adam Spiers wrote: > On Thu, Apr 11, 2013 at 01:25:53AM -0400, Jeff King wrote: > > On Thu, Apr 11, 2013 at 02:59:31AM +0100, Adam Spiers wrote: > > > -static int check_ignore(const char *prefix, const char **pathspec) > > > +static int check_ignore(struct

Re: [PATCH 2/5] check-ignore: allow incremental streaming of queries via --stdin

On Thu, Apr 11, 2013 at 12:20:00PM +0100, Adam Spiers wrote: > On Thu, Apr 11, 2013 at 02:59:32AM +0100, Adam Spiers wrote: > > +test_expect_success STDBUF 'streaming support for --stdin' ' > > + ( > > + echo one > > + sleep 2 > > + echo two > > + ) | stdbuf -oL g

Re: [PATCH 2/2] doc/http-backend: give some lighttpd config examples

W dniu 11.04.2013 19:02, Jeff King napisał: > On Thu, Apr 11, 2013 at 06:47:49PM +0200, Jakub Narębski wrote: >> W dniu 11.04.2013 05:36, Jeff King napisał: >> >>> +Note that unlike the similar setup with Apache, we can easily match the >>> +query string for receive-pack, catching the initial reque

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

Jeff King wrote: > I could go either way. I think 96b9e0e is the right thing to do > conceptually, but I kind of doubt it was affecting all that many people. > And though it's _possible_ for it to be a security problem, I find it > much more likely that the site admin tries to set some config, get

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

On Thu, Apr 11, 2013 at 11:11:03AM -0700, Jonathan Nieder wrote: > > -- >8 -- > > Subject: [PATCH] daemon: set HOME when we switch to --user > > Thanks for taking care of it. For what it's worth, > > Acked-by: Jonathan Nieder > > I'm not sure whether to keep 96b9e0e (config: treat user and xd

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

Jeff King wrote: > Here it is with a commit message. > > -- >8 -- > Subject: [PATCH] daemon: set HOME when we switch to --user Thanks for taking care of it. For what it's worth, Acked-by: Jonathan Nieder I'm not sure whether to keep 96b9e0e (config: treat user and xdg config permission proble

Re: [PATCH v2 5/5] Documentation: add caveats about I/O buffering for check-{attr,ignore}

Adam Spiers writes: > diff --git a/Documentation/git-check-ignore.txt > b/Documentation/git-check-ignore.txt > index 7e3cabc..8e1f7ab 100644 > --- a/Documentation/git-check-ignore.txt > +++ b/Documentation/git-check-ignore.txt > @@ -81,6 +81,11 @@ not. (Without this option, it would be impossib

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

On Thu, Apr 11, 2013 at 11:59 AM, Jeff King wrote: > On Thu, Apr 11, 2013 at 11:49:11AM -0500, Felipe Contreras wrote: > >> > I am OK with adding the test for import as a separate patch. What I am >> > not OK with (and this goes for the rest of the commit message, too) is >> > failing to explain a

Re: [PATCH v4 00/21] remote-hg: general updates

Felipe Contreras writes: > This is a reroll of the previous series due to a few minor issues. As the > previous version, forced pushes remain a configuration option. Also, I picked > up a fix for test regarding hg_log() that was sent to the mailing list. Will replace the previous round with this

[PATCH v5] transport-helper: report errors properly

If a push fails because the remote-helper died (with fast-export), the user might not see any error message. So let's add one. Suggested-by: Jeff King Signed-off-by: Felipe Contreras --- git-remote-testgit| 11 +++ t/t5801-remote-helpers.sh | 10 ++ transport-helper.c

Re: [PATCH] pull: fail early if we know we can't merge from upstream

Carlos Martín Nieto writes: > I can't quite decide whether the behaviour of 'git pull' with no > upstream configured but a default remote with no fetch refspecs > merging the remote's HEAD is a feature, a bug or something in between, > but it's used by t7409 so maybe someone else is using it and

Re: Locating merge that dropped a change

On 09/04/2013 21:00, Kevin Bracey wrote: So, how to automatically find a merge that ignored a known change? I think I've found the problem. It only doesn't work _if you specify the file_. Specifically, if I was missing an addition, my first attempt to find it would be git log -p -m -S

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

On Thu, Apr 11, 2013 at 08:35:46AM -0700, Junio C Hamano wrote: > > Yeah, I think the bug here is that git-daemon should be setting $HOME > > when it switches privileges with --user. Does this patch fix it for you? > [...] > Yeah, that sounds like the obvious fix to me. Here it is with a commit m

[PATCH] RelNotes: few typofixes in notes for recent releases

Signed-off-by: Stefano Lattarini --- Documentation/RelNotes/1.8.2.1.txt | 2 +- Documentation/RelNotes/1.8.3.txt | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index 1354ad0..769a6fc 100644 --

git-svn: wrong history after cloning a repository

Hi, I'm currently struggeling with a strage behaviour of git-svn: After git-svn-cloning a given repository (see attachment) in some cases the git blame differs from the svn blame. The history looks like after a merge all affected files have been added from scratch at this revision. The behaviour

Re: [PATCH 2/2] doc/http-backend: give some lighttpd config examples

On Thu, Apr 11, 2013 at 06:47:49PM +0200, Jakub Narębski wrote: > W dniu 11.04.2013 05:36, Jeff King napisał: > > > +Note that unlike the similar setup with Apache, we can easily match the > > +query string for receive-pack, catching the initial request from the > > +client. This means that the s

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

On Thu, Apr 11, 2013 at 11:49:11AM -0500, Felipe Contreras wrote: > > I am OK with adding the test for import as a separate patch. What I am > > not OK with (and this goes for the rest of the commit message, too) is > > failing to explain any back-story at all for why the change is done in > > the

Re: [PATCH/RFC 3/3] Teach mv to update the path entry in .gitmodules for moved submodules

Jens Lehmann writes: > Currently using "git mv" on a submodule moves the submodule's work tree in > that of the superproject. But the submodule's path setting in .gitmodules > is left untouched, which is now inconsistent with the work tree and makes > git commands that rely on the proper path ->

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

On Thu, Apr 11, 2013 at 11:18 AM, Jeff King wrote: > On Thu, Apr 11, 2013 at 08:22:26AM -0500, Felipe Contreras wrote: > >> > We >> > currently do so robustly when the helper uses the "done" >> > feature (and that is what we test). We cannot do so >> > reliably when the helper does not use the "d

Re: [PATCH 2/2] doc/http-backend: give some lighttpd config examples

W dniu 11.04.2013 05:36, Jeff King napisał: > +Note that unlike the similar setup with Apache, we can easily match the > +query string for receive-pack, catching the initial request from the > +client. This means that the server administrator does not have to worry > +about configuring `http.recei

Re: [PATCH/RFC 1/3] Teach mv to move submodules together with their work trees

Ramkumar Ramachandra writes: > Why does it search for a submodule with a trailing slash in the index? > You make it sound like it's doing something unnatural; in reality, it > does this because it executes lstat() on the filesystem path > specified, and the stat mode matches S_ISDIR (because it

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

W dniu 11.04.2013 03:56, Jeff King napisał: > So _if_ you fixed it by setting http.receivepack (which I think is the > simplest thing under Apache, since matching the query string there is > hard), then you would need a version of git with that fix on the > client side to actually have git prompt

Re: [PATCH/RFC 1/3] Teach mv to move submodules together with their work trees

Ramkumar Ramachandra writes: >> Then rename() will move the submodule work tree just >> like it moves a file. > > What is this rename() function you're talking about? I don't see it anywhere. "man 2 rename"; it is called from a generic part of builtin/mv.c to rename one path to another and can

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

On Thu, Apr 11, 2013 at 08:22:26AM -0500, Felipe Contreras wrote: > > We > > currently do so robustly when the helper uses the "done" > > feature (and that is what we test). We cannot do so > > reliably when the helper does not use the "done" feature, > > but it is not even worth testing; the rig

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

On 04/11/2013 06:26 PM, Simon Ruderich wrote: > I think we should remove sslverify = false from the other example > as well. "Recommending" sslverify = false is IMHO a bad idea as > SSL provides no protection without verification. Yep, that was why I thought there should be at least an example wi

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

Jeff King writes: > On Thu, Apr 11, 2013 at 05:39:43AM +0200, Mike Galbraith wrote: > >> > ALLOWED_ENV="PATH HOME" >> > HOME=/ >> >> I can work around it by changing the init script to use su - git -c "bla >> bla" to launch the thing, instead of using --user=git --group=daemon, >> but that's

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

On Wed, Apr 10, 2013 at 11:44:03AM -0700, Junio C Hamano wrote: > The reason why we can run with sslverify=true against gmail is > because we know imap.gmail.com gives a validly signed certificate > that leads all the way to a root CA the user's OpenSSL installation > is likely to trust (if your ha

Re: git log -p unexpected behaviour - security risk?

On Thu, Apr 11, 2013 at 6:36 PM, John Tapsell wrote: > I noticed that code that you put in merge will not be visible by > default. This seems like a pretty horrible security problem, no? > > I made the following test tree, with just 3 commits: > > https://github.com/johnflux/ExampleEvilness.git

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

On 04/10/2013 09:44 PM, Junio C Hamano wrote: > Thanks. My pleasure. > While removing that item from the configuration is a good thing to > do in the post 1.8.2.1 era, the reason why it is does not have much > to do with "GMail is SSL capable". Should I change the commit message in order to avoi

Re: [PATCH v3] cherry-pick: make sure all input objects are commits

Miklos Vajna wrote: > Signed-off-by: Miklos Vajna This one looks good. FWIW, Reviewed-by: Ramkumar Ramachandra -- 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.h

[PATCH] pull: fail early if we know we can't merge from upstream

A 'git pull' without specifying a remote is asked to take the current branch's upstream as the branch to merge from. This cannot work without an upstream configuration nor with HEAD detached, but we only check for this after fetching. Perform the check beforehand, as we already know whether we hav

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

On Wed, Apr 10, 2013 at 4:15 PM, Jeff King wrote: > From: Felipe Contreras > > If a push fails because the remote-helper died (with > fast-export), the user does not see any error message. We do > correctly die with a failed exit code, as we notice that the > helper has died while reading back th

Re: Git crash in Ubuntu 12.04

On Thu, 11 Apr 2013 15:50:31 +0530 Sivaram Kannan wrote: [...] > Output of coredump gdb: > > gitadmin@gitserver:/var/crash/dump$ gdb git CoreDump > GNU gdb (Ubuntu/Linaro 7.4-2012.04-0ubuntu2.1) 7.4-2012.04 > Copyright (C) 2012 Free Software Foundation, Inc. > License GPLv3+: GNU GPL version 3 o

[PATCH v3] cherry-pick: make sure all input objects are commits

When a single argument was a non-commit, the error message used to be: fatal: BUG: expected exactly one commit from walk For multiple arguments, when none of the arguments was a commit, the error was: fatal: empty commit set passed Finally, when some of the arguments were non-co

[PATCH v4 07/21] remote-hg: redirect buggy mercurial output

Mercurial emits messages like "searching for changes", "no changes found", etc. meant for the use of its own UI layer, which break the pipe between transport helper and remote helper. Since there's no way to silence Mercurial, let's redirect to standard error. Signed-off-by: Felipe Contreras ---

[PATCH v4 21/21] remote-hg: activate graphlog extension for hg_log()

From: Antoine Pelisse The hg_log() test helper uses the "--graph" parameter that is implemented by the GraphLog extension. If the extension is not activated by the user, the parameter is not available. Activate the extension in setup(). Also changes the way we grep the output in hg_log(). The pi

[PATCH v4 20/21] remote-hg: fix bad file paths

Mercurial allows absolute file paths, and Git doesn't like that. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg in

[PATCH v4 19/21] remote-hg: document location of stored hg repository

From: Simon Ruderich Signed-off-by: Simon Ruderich Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index e3d7f77..0db4cca 100755 --- a/co

[PATCH v4 18/21] remote-hg: fix bad state issue

The problem reportedly happened after doing a push that fails, the abort causes the state of remote-hg to go bad, this happens because remote-hg's marks are not stored, but 'git fast-export' marks are. Ensure that the marks are _always_ stored. Signed-off-by: Felipe Contreras --- contrib/remote

[PATCH v4 17/21] remote-hg: add 'insecure' option

From: Simon Ruderich If set to true acts as hg's clone/pull --insecure option. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 9 + 1 file changed, 9 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg inde

[PATCH v4 16/21] remote-hg: add simple mail test

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 62e3a47..6a1e4b1 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/re

[PATCH v4 14/21] remote-hg: show more proper errors

When cloning or pushing fails, we don't want to show a stack-trace. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-

[PATCH v4 15/21] remote-hg: add basic author tests

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 35 +++ 1 file changed, 35 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5f81dfa..62e3a47 100755 --- a/contrib/remote-helpers/test-hg.

[PATCH v4 12/21] remote-hg: push to the appropriate branch

From: Dusty Phillips Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 1 file changed, 4 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index fc04f81..ec599c6 100755 --- a/contrib/remote-helpers/git-remot

[PATCH v4 13/21] remote-hg: force remote push

Ideally we shouldn't do this, as it's not recommended in mercurial documentation, but there's no other way to push multiple bookmarks (on the same branch), which would be the behavior most similar to git. At the same time, add a configuration option for the people that don't want to risk creating

[PATCH v4 11/21] remote-hg: update tags globally

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 46cddc9..fc04f81 100755 --- a/contrib/remote-helpers/git-remote-hg +

[PATCH v4 10/21] remote-hg: update remote bookmarks

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 5 + 1 file changed, 5 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 3ceec85..46cddc9 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/rem

[PATCH v4 09/21] remote-hg: refactor export

No functional changes. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 73cd812..3ceec85 100755 ---

  1   2   >