Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Matthieu Moy
Jeff King writes: > So yeah. Matthieu's patch is the right thing to do, as it covers both Thanks, > (mine fixed only half of it). (Sorry, I had missed yours) -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Re: Git-aware HTTP transport docs

2013-02-12 Thread Scott Chacon
I don't believe it was ever merged into the Git docs. I have a copy of it here: https://www.dropbox.com/s/pwawp8kmwgyc3w2/http-protocol.txt Scott On Tue, Feb 12, 2013 at 5:34 PM, H. Peter Anvin wrote: > Hi Shawn, > > You wrote a really great protocol spec for the smart HTTP protocol back > in

Re: Git-aware HTTP transport docs

2013-02-12 Thread H. Peter Anvin
Hi Shawn, You wrote a really great protocol spec for the smart HTTP protocol back in the day. It would be really great if it could be checked into the git repository (updated if need be). Someone mentioned today trying to reverse-engineer the protocol because of a lack of specs, and I was a bit

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Andrew Ardill
On 13 February 2013 11:34, Junio C Hamano wrote: > The change could negatively affect people who expect that removing > files that are not used for their purpose (e.g. a large file that is > unnecessary for their build) will _not_ affect what they get from > "git add ."; How big a problem is this

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Junio C Hamano
Andrew Ardill writes: > On 13 February 2013 11:06, Junio C Hamano wrote: >> * jc/add-delete-default (2012-08-13) 1 commit >> - git add: notice removal of tracked paths by default >> >> "git add dir/" updated modified files and added new files, but does >> not notice removed files, which may b

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Andrew Ardill
On 13 February 2013 11:06, Junio C Hamano wrote: > * jc/add-delete-default (2012-08-13) 1 commit > - git add: notice removal of tracked paths by default > > "git add dir/" updated modified files and added new files, but does > not notice removed files, which may be "Huh?" to some users. They >

Re: jn/shell-disable-interactive (Re: What's cooking in git.git (Feb 2013, #05; Tue, 12))

2013-02-12 Thread Junio C Hamano
Jonathan Nieder writes: > Junio C Hamano wrote: > >> * jn/shell-disable-interactive (2013-02-11) 2 commits >> - shell: pay attention to exit status from 'help' command >> - shell doc: emphasize purpose and security model >> >> Will merge to 'next'. > > Please hold off on merging the second pat

jn/shell-disable-interactive (Re: What's cooking in git.git (Feb 2013, #05; Tue, 12))

2013-02-12 Thread Jonathan Nieder
Junio C Hamano wrote: > * jn/shell-disable-interactive (2013-02-11) 2 commits > - shell: pay attention to exit status from 'help' command > - shell doc: emphasize purpose and security model > > Will merge to 'next'. Please hold off on merging the second patch. I'd like to reroll renaming the

What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-12 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A preview of the upcoming release 1.8.2-rc0 is expected to be tagged late this week. You can find the changes described here in the integration

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 02:13:05PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I'm not sure I understand the original poster's point about "git config > > -l --local". "-l" does not take a limiter, does it? > > "git config -l core.\*" will just die without limiting the output to > ev

[PATCH 4/4] contrib/subtree: update documentation

2013-02-12 Thread Paul Campbell
>From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 12 Feb 2013 00:07:26 + Subject: [PATCH 4/4] contrib/subtree: update documentation Signed-off-by: Paul Campbell --- contrib/subtree/git-subtree.txt | 13 + 1 file changed, 9 ins

[PATCH 3/4] contrib/subtree/t: Added tests for .gitsubtree support

2013-02-12 Thread Paul Campbell
55 add: ensure details are added to .gitsubtree 56 push: check for a SHA1 update line 57 pull: add a file on one subtree, push it to a branch, then pull into another subtree containing the same branch and confirm the files match 58 add: ensure stale .gitsubtree entry is replaced Signed-off

[PATCH 2/4] contrib/subtree: Allow stale .gitsubtree entries to be replaced

2013-02-12 Thread Paul Campbell
Should .gitsubtree have a listed that doesn't exist on disk, allow it to be replaced/updated by a git subtree add. Ideally I would have aborted the operation if there was an existing entry and required the user to edit the .gitsubtree file by hand, but that behaviour broke a lot of the tests. Si

[PATCH 1/4] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

2013-02-12 Thread Paul Campbell
Having to remember what subtree came from what source is a waste of developer memory and doesn't transfer easily to other developers. git subtree push/pull operations would typically be to/from the same source that the original subtree was cloned from with git subtree add. The and , or , used i

Re: [PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 03:16:51PM -0800, Jonathan Nieder wrote: > Junio C Hamano wrote: > > > These are defined in the main Makefile to be funny values that are > > optionally relative to an unspecified location that is determined at > > runtime. > [...] > > A longer term fix is to introduce runt

Re: [PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread Jonathan Nieder
Junio C Hamano wrote: > These are defined in the main Makefile to be funny values that are > optionally relative to an unspecified location that is determined at > runtime. [...] > A longer term fix is to introduce runtime_{man,html,info}dir variables > to hold these funny values, and make {man,ht

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread Junio C Hamano
John Keeping writes: > Looks like it - I tried this for the first time today (with pu) so I > didn't realise it was a recent change, and I didn't think to blame the > export line. Unfortunately that bogus change is already in 'next', but luckily we caught it before it graduated to 'master' ;-)

Re: A good Git technique for referring back to original files

2013-02-12 Thread Paul Campbell
Hi Mike, I think git-cvsimport and git-subtree could help you here. Roughly: # Create a git version of each SDK_subproj git cvsimport -r upstream -d $CVSREPO1 $CVSMODULE1 -C SDK_subproj1 git cvsimport -r upstream -d $CVSREPO2 $CVSMODULE2 -C SDK_subproj2 # Create your Working_SDK git init Workin

[PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread Junio C Hamano
These are defined in the main Makefile to be funny values that are optionally relative to an unspecified location that is determined at runtime. They are only suitable for hardcoding in the binary via the -DGIT_{MAN,HTML,INFO}_PATH= C preprocessor options, and are not real paths, contrary to what

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:57:25PM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > I _think_ exporting mandir/html/infodir from the top-level Makefile > > is wrong to begin with. We should drop the "export mandir" from > > there. > > Ah, it is this thing, isn't it? > > commit d8cf9

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:45:34PM -0800, Junio C Hamano wrote: > Jonathan Nieder writes: > > > John Keeping wrote: > > > >> Documentation/Makefile: fix inherited {html,info,man}dir > > > > This doesn't seem to have hit the list. > > More importantly, > > >> When using the top-level install-

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread Junio C Hamano
Junio C Hamano writes: > I _think_ exporting mandir/html/infodir from the top-level Makefile > is wrong to begin with. We should drop the "export mandir" from > there. Ah, it is this thing, isn't it? commit d8cf908cb6012cd4dc3d1089a849daf646150c2e Author: Junio C Hamano Date: Sat Feb 2 17:5

Re: [PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Brandon Casey
On Tue, Feb 12, 2013 at 11:29 AM, Junio C Hamano wrote: > Brandon Casey writes: >> diff --git a/builtin/log.c b/builtin/log.c >> index 8f0b2e8..59de484 100644 >> --- a/builtin/log.c >> +++ b/builtin/log.c >> @@ -253,9 +255,12 @@ static int detect_any_signoff(char *letter, int size) >> ret

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
On Tue, Feb 12 2013, Junio C Hamano wrote: > I would actually vote for the most explicit: > > _cmd_close($ctx, (grep { defined } ($in, $out))); To me that looks weird at best, but I don't have strong opinions on that matter. -- Best regards, _ _

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread Junio C Hamano
Jonathan Nieder writes: > John Keeping wrote: > >> Documentation/Makefile: fix inherited {html,info,man}dir > > This doesn't seem to have hit the list. More importantly, >> When using the top-level install-doc target the html, info and man >> target directories are inherited from the top-lev

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: > On Tue, Feb 12, 2013 at 02:25:08PM -0800, Jonathan Nieder wrote: >> John Keeping wrote: >>> Documentation/Makefile: fix inherited {html,info,man}dir >> >> This doesn't seem to have hit the list. > > Hmm... it made it to gmane: > > http://article.gmane.org/gmane.comp.version

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:25:08PM -0800, Jonathan Nieder wrote: > John Keeping wrote: > > > Documentation/Makefile: fix inherited {html,info,man}dir > > This doesn't seem to have hit the list. Hmm... it made it to gmane: http://article.gmane.org/gmane.comp.version-control.git/216188 -- To un

Re: [PATCH 2/2] t9903: add test case for bash.showUntrackedFiles

2013-02-12 Thread Junio C Hamano
Martin Erik Werner writes: > Add a test case for the bash.showUntrackedFiles config option, which > checks that the config option can disable the global effect of the > GIT_PS1_SHOWUNTRACKEDFILES environmant variable. > > Signed-off-by: Martin Erik Werner > --- > t/t9903-bash-prompt.sh | 11 +

Re: [PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: > Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. Thanks, Jonathan -- 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.ke

Re: [PATCH 1/2] bash completion: add bash.showUntrackedFiles option

2013-02-12 Thread Junio C Hamano
Martin Erik Werner writes: > Add a config option 'bash.showUntrackedFiles' which allows enabling > the prompt showing untracked files on a per-repository basis. This is > useful for some repositories where the 'git ls-files ...' command may > take a long time. > > Signed-off-by: Martin Erik Werne

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Junio C Hamano
Jeff King writes: > I'm not sure I understand the original poster's point about "git config > -l --local". "-l" does not take a limiter, does it? "git config -l core.\*" will just die without limiting the output to everything under core. hierarchy, so you are right---the combination does not mak

Re: [PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 01:01:38PM -0800, Jonathan Nieder wrote: > John Keeping wrote: > > > Signed-off-by: John Keeping > [...] > > --- a/Documentation/Makefile > > +++ b/Documentation/Makefile > > @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT)) > > prefix ?= $(HOME) > > bindir

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 01:14:57PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: > > > >> sub command_close_bidi_pipe { > >>local $?; > >>my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); > >> - _cmd_close($

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Junio C Hamano
Michal Nazarewicz writes: >>> Michal Nazarewicz writes: >>> > The body of the loop in command_close_bidi_pipe function is identical to >>> > what _cmd_close function does so instead of duplicating, refactor change >>> > _cmd_close so that it accepts list of file handlers to be closed, which > >>

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Junio C Hamano
Jeff King writes: > On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: > >> sub command_close_bidi_pipe { >> local $?; >> my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); >> -_cmd_close($ctx, $in, $out); >> +_cmd_close($ctx, grep defined, $in, $out); > > May

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
On Tue, Feb 12 2013, Jeff King wrote: > On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: > >> sub command_close_bidi_pipe { >> local $?; >> my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); >> -_cmd_close($ctx, $in, $out); >> +_cmd_close($ctx, grep defined, $

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Michal Nazarewicz
>> Michal Nazarewicz writes: >> > The body of the loop in command_close_bidi_pipe function is identical to >> > what _cmd_close function does so instead of duplicating, refactor change >> > _cmd_close so that it accepts list of file handlers to be closed, which > On Tue, Feb 12, 2013 at 10:55:05A

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 09:34:39AM -0800, Junio C Hamano wrote: > I see the second hunk is new. Comments? > [...] > > @@ -1676,7 +1676,7 @@ _git_config () > > case "$cur" in > > --*) > > __gitcomp " > > - --global --system --file= > > + --sy

Re: [PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: > Signed-off-by: John Keeping [...] > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT)) > prefix ?= $(HOME) > bindir ?= $(prefix)/bin > htmldir ?= $(prefix)/share/doc/git-doc > +infodir ?= $(prefix)/

Re: [PATCH 1/3] Documentation/Makefile: fix spaces around assignments

2013-02-12 Thread Jonathan Nieder
Hi, John Keeping wrote: > [Subject: [PATCH 1/3] Documentation/Makefile: fix spaces around assignments] It's not so much "fix spaces" as "use consistent spacing", no? Aside from that nit, looks like a sensible no-op to me, so Reviewed-by: Jonathan Nieder Thanks. -- To unsubscribe from this lis

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: > sub command_close_bidi_pipe { > local $?; > my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); > - _cmd_close($ctx, $in, $out); > + _cmd_close($ctx, grep defined, $in, $out); Maybe it is just me, but I fin

Re: inotify to minimize stat() calls

2013-02-12 Thread Karsten Blees
Am 11.02.2013 04:53, schrieb Duy Nguyen: > On Sun, Feb 10, 2013 at 11:58 PM, Erik Faye-Lund wrote: >> Karsten Blees has done something similar-ish on Windows, and he posted >> the results here: >> >> https://groups.google.com/forum/#!topic/msysgit/fL_jykUmUNE/discussion >> The new hashtable imple

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 10:55:05AM -0800, Junio C Hamano wrote: > Michal Nazarewicz writes: > > > From: Michal Nazarewicz > > > > The body of the loop in command_close_bidi_pipe function is identical to > > what _cmd_close function does so instead of duplicating, refactor change > > _cmd_close

Re: [PATCH v4 00/12] unify appending of sob

2013-02-12 Thread Junio C Hamano
Jonathan Nieder writes: > Brandon Casey wrote: > >> Round 4. > > Yay. I think this is cooked now and a good foundation for later > changes on top. > > For what it's worth, with or without the two tweaks Junio suggested > (simplifying "(cherry picked from" detection, deferring introduction > of n

Re: Pushing a git repository to a new server

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 12:28:53PM +0100, Michael J Gruber wrote: > I'm not sure providers like GitHub would fancy an interface which allows > the programmatic creation of repos (giving a new meaning to "fork > bomb"). But I bet you know better ;-) You can already do that: http://developer.git

[PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread John Keeping
Signed-off-by: John Keeping --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index af3d8a4..0cfdc36 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubs

[PATCH 0/3] Fix installation paths with "make install-doc"

2013-02-12 Thread John Keeping
When using the top-level install-doc target the html, info and man target directories are inherited from the top-level Makefile by the documentation Makefile as relative paths, which is not expected and results in the files being installed in an unexpected location. The first two patches are simpl

[PATCH 3/3] Documentation/Makefile: fix inherited {html,info,man}dir

2013-02-12 Thread John Keeping
Commit e14421b (Allow INSTALL, bindir, mandir to be set in main Makefile - 2006-06-29) changed Documentation/Makefile to inherit the value of mandir from the top-level Makefile when invoked as "make install-doc" at the top-level. This was inherited by infodir and htmldir when they were added. Thi

[PATCH 1/3] Documentation/Makefile: fix spaces around assignments

2013-02-12 Thread John Keeping
A simple style fix; no functional change. Signed-off-by: John Keeping --- Documentation/Makefile | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 62dbd9a..af3d8a4 100644 --- a/Do

Re: [PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Junio C Hamano
Jonathan Nieder writes: > Brandon Casey wrote: > >> I'm not sure we should apply this though. I'm leaning towards saying that >> the 'cherry-pick -s' behavior with respect to a commit with an empty message >> body should be undefined. If we want it to be undefined then we probably >> shouldn't

Re: [PATCH v4 00/12] unify appending of sob

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: > Round 4. Yay. I think this is cooked now and a good foundation for later changes on top. For what it's worth, with or without the two tweaks Junio suggested (simplifying "(cherry picked from" detection, deferring introduction of no_dup_sob variable until it is used), Revi

[PATCH 1/2] bash completion: add bash.showUntrackedFiles option

2013-02-12 Thread Martin Erik Werner
Add a config option 'bash.showUntrackedFiles' which allows enabling the prompt showing untracked files on a per-repository basis. This is useful for some repositories where the 'git ls-files ...' command may take a long time. Signed-off-by: Martin Erik Werner --- contrib/completion/git-prompt.sh

[PATCH 2/2] t9903: add test case for bash.showUntrackedFiles

2013-02-12 Thread Martin Erik Werner
Add a test case for the bash.showUntrackedFiles config option, which checks that the config option can disable the global effect of the GIT_PS1_SHOWUNTRACKEDFILES environmant variable. Signed-off-by: Martin Erik Werner --- t/t9903-bash-prompt.sh | 11 +++ 1 file changed, 11 insertions(

[PATCH 0/2] Add bash.showUntrackedFiles config option

2013-02-12 Thread Martin Erik Werner
Hi, Here is a patch adding a config option for showing untracked files in the shell prompt, I've noticed having it enabled tends to make the prompt act very sluggish in some cases (large repos / unfriendly filesystems). So it would be nice to have a more fine-grained control over it, similar to wh

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey writes: > On 2/12/2013 11:36 AM, Junio C Hamano wrote: >> Brandon Casey writes: >> > + return len > strlen(cherry_picked_prefix) + 1 && > + !prefixcmp(buf, cherry_picked_prefix) && buf[len - 1] == ')'; > +} Does the first "is it longer than the prefix

Re: [PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: > I'm not sure we should apply this though. I'm leaning towards saying that > the 'cherry-pick -s' behavior with respect to a commit with an empty message > body should be undefined. If we want it to be undefined then we probably > shouldn't introduce a test which would have

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:36 AM, Junio C Hamano wrote: > Brandon Casey writes: > + return len > strlen(cherry_picked_prefix) + 1 && + !prefixcmp(buf, cherry_picked_prefix) && buf[len - 1] == ')'; +} >>> >>> Does the first "is it longer than the prefix?" check matter? If it >>> is

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: > On 2/12/2013 11:13 AM, Junio C Hamano wrote: >> Brandon Casey writes: >>> +static int is_cherry_picked_from_line(const char *buf, int len) >>> +{ >>> + /* >>> +* We only care that it looks roughly like (cherry picked from ...) >>> +*/ >>> + return len > strlen(c

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey writes: >>> + return len > strlen(cherry_picked_prefix) + 1 && >>> + !prefixcmp(buf, cherry_picked_prefix) && buf[len - 1] == ')'; >>> +} >> >> Does the first "is it longer than the prefix?" check matter? If it >> is not, prefixcmp() would not match anyway, no? > > Pro

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:13 AM, Junio C Hamano wrote: > Brandon Casey writes: > >> When 'cherry-pick -s' is used to append a signed-off-by line to a cherry >> picked commit, it does not currently detect the "(cherry picked from..." >> that may have been appended by a previous 'cherry-pick -x' as part of t

Re: [PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Junio C Hamano
Brandon Casey writes: > From: Nguyễn Thái Ngọc Duy > > This is a preparation step for merging with append_signoff from > sequencer.c > > Signed-off-by: Nguyễn Thái Ngọc Duy > Signed-off-by: Brandon Casey > Reviewed-by: Jonathan Nieder > --- > builtin/log.c | 13 + > log-tree.c

Re: [PATCH v4 05/12] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey writes: > When 'cherry-pick -s' is used to append a signed-off-by line to a cherry > picked commit, it does not currently detect the "(cherry picked from..." > that may have been appended by a previous 'cherry-pick -x' as part of the > s-o-b footer and it will insert a blank line be

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Junio C Hamano
Michal Nazarewicz writes: > From: Michal Nazarewicz > > The body of the loop in command_close_bidi_pipe function is identical to > what _cmd_close function does so instead of duplicating, refactor change > _cmd_close so that it accepts list of file handlers to be closed, which s/file handlers/f

RE: Fetch and -t

2013-02-12 Thread Olsen, Alan R
[Sorry for the top-posting. I *hate* Outlook.] I will need to check why my system is showing old man pages. I am running something compiled from the git tree on kernel.org. Thanks! -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Monday, February 11, 2013 6:25 P

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping writes: > On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote: >> >> So it needs to be more like this, and I think it still is more >> readable. > > Agreed. Will you squash this in or do you want a re-roll? I can squash this and the previous one into your original to a s

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping writes: >> I am not sure if I understand what you meant by "literal backslash >> blah blah", though. > > It turns out that having this in the script works (in bash and dash > although I haven't checked what Posix has to say about it): > > sed -e "2,$ s/^/\\\/" > > and is equivale

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote: > > So it needs to be more like this, and I think it still is more > readable. Agreed. Will you squash this in or do you want a re-roll? > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index cbe36bf..8

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> The strings that are fed to _() would be updated with your patch, >> but the replacement will stay to be "filepattern" translated to the >> target language. Translators have to actively hunt for the messages >> to update them. If you left the

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-12 Thread Junio C Hamano
Phil Hord writes: >> + if test $# = 0 >> + then >> + die "$(eval_gettext "Use '.' if you really want to >> deinitialize all submodules")" >> + fi >> + >> + module_list "$@" | >> + while read mode sha1 stage sm_path >> + do >> + die_

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
Junio C Hamano writes: >> cat >comment-lines.sh <> #!$SHELL_PATH >> -sed -e "2,\$ s/^/\\/" "\$1" >"\$1".tmp >> +sed -e "2,\$ s/^//" "\$1" >"\$1".tmp >> mv "\$1".tmp "\$1" >> EOF >> chmod a+x comment-lines.sh && > > Yeek. If you used write_script with here-text that does

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 09:29:26AM -0800, Junio C Hamano wrote: > John Keeping writes: > > > ... the following fixup is also needed to avoid relying on the shell > > emitting a literal backslash when a backslash isn't followed by a known > > escape character. > > > > -- >8 -- > > > > diff --git a

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Junio C Hamano
Matthieu Moy writes: > This needs to be done in two places: __git_config_get_set_variables to > allow clever completion of "git config --local --get foo", and > _git_config to allow "git config --loc" to complete to --local. > > While we're there, change the order of options in the code to match

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping writes: > ... the following fixup is also needed to avoid relying on the shell > emitting a literal backslash when a backslash isn't followed by a known > escape character. > > -- >8 -- > > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index cbe36bf..84

Re: [PATCH v3 3/4] count-objects: report garbage files in pack directory too

2013-02-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +/* A hook for count-objects to report invalid files in pack directory */ > +extern void (*report_garbage)(const char *desc, const char *path, int len, > const char *name); We may want to document the strange way the last three parameters are used somewhere. e.g.

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-12 Thread Phil Hord
I haven't tried it yet, but I have some comments. On Wed, Feb 6, 2013 at 4:11 PM, Jens Lehmann wrote: > With "git submodule init" the user is able to tell git he cares about one > or more submodules and wants to have it populated on the next call to "git > submodule update". But currently there i

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Matthieu Moy
Junio C Hamano writes: > The strings that are fed to _() would be updated with your patch, > but the replacement will stay to be "filepattern" translated to the > target language. Translators have to actively hunt for the messages > to update them. If you left the .po files untouched, they woul

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Junio C Hamano
Matthieu Moy writes: > pathspec is the most widely used term, and is the one defined in > gitglossary.txt. was used only in the synopsys for git-add > and git-commit, and in git-add.txt. Get rid of it. > > This patch is obtained with by running: > > perl -pi -e 's/filepattern/pathspec/' `git g

Re: [git-multimail] License unknown (#1)

2013-02-12 Thread Andy Parkins
On Sunday 27 January 2013 18:52:58 Michael Haggerty wrote: > I have a question about the license of contrib/hooks/post-commit-email. > I had assumed that since it is in the git project, which is GPLv2, and > since it contains no contrary information, it would by implication also > fall under GPLv2

Re: Fwd: Re: [git-multimail] License unknown (#1)

2013-02-12 Thread Andy Parkins
On Tuesday 12 February 2013 09:01:14 Michael Haggerty wrote: > I assume you are the Andy Parkins who originally submitted > post-commit-email to the Git project... I am indeed. Hello. > I have derived another script from yours: > > https://github.com/mhagger/git-multimail > > I affixed th

[PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor change _cmd_close so that it accepts list of file handlers to be closed, which makes it usable with command_close_bidi_pipe. Signed-o

[PATCHv4 2/6] Git.pm: fix example in command_close_bidi_pipe documentation

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz Signed-off-by: Michal Nazarewicz --- perl/Git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git.pm b/perl/Git.pm index bbb753a..11f310a 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -418,7 +418,7 @@ and it is the fourth value returned by C

[PATCHv4 5/6] Git.pm: add interface for git credential command

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz Add a credential() function which is an interface to the git credential command. The code is heavily based on credential_* functions in . Signed-off-by: Michal Nazarewicz --- perl/Git.pm | 151 1 file changed

[PATCHv4 1/6] Git.pm: allow command_close_bidi_pipe to be called as method

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz The documentation of command_close_bidi_pipe() claims that it can be called as a method, but it does not check whether the first argument is $self or not assuming the latter. Using _maybe_self() fixes this. Signed-off-by: Michal Nazarewicz --- perl/Git.pm | 2 +- 1 fil

[PATCHv4 6/6] git-send-email: use git credential to obtain password

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz If smtp_user is provided but smtp_pass is not, instead of prompting for password, make git-send-email use git credential command instead. Signed-off-by: Michal Nazarewicz --- Documentation/git-send-email.txt | 4 +-- git-send-email.perl | 59 ++

[PATCHv4 0/6] git-credential support in git-send-email

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz Besids git-credential support in git-send-email, there are some other minor improvements to Git.pm in this patchset. Patch 3/6 is new compared to the previous patchset. Michal Nazarewicz (6): Git.pm: allow command_close_bidi_pipe to be called as method Git.pm: fix ex

[PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz The command_close_bidi_pipe() function will insist on closing both input and output pipes returned by command_bidi_pipe(). With this change it is possible to close one of the pipes in advance and pass undef as an argument. Signed-off-by: Michal Nazarewicz --- perl/Git.

[PATCH] completion: support 'git config --local'

2013-02-12 Thread Matthieu Moy
This needs to be done in two places: __git_config_get_set_variables to allow clever completion of "git config --local --get foo", and _git_config to allow "git config --loc" to complete to --local. While we're there, change the order of options in the code to match git-config.txt. Signed-off-by:

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread Philip Oakley
From: "John Keeping" Sent: Tuesday, February 12, 2013 11:37 AM On Tue, Feb 12, 2013 at 11:11:17AM -, Philip Oakley wrote: Obviously (?) this is generated from the command-list.txt file, though I don't see a shell script that would generate the 'cmds-mainporcelain.txt' (etc.) files (//githu

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 11:11:17AM -, Philip Oakley wrote: > Obviously (?) this is generated from the command-list.txt file, though I > don't see a shell script that would generate the > 'cmds-mainporcelain.txt' (etc.) files > (//github.com/gitster/git-htmldocs). They are also part of the ms

Re: Pushing a git repository to a new server

2013-02-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.02.2013 17:27: > On Mon, Feb 11, 2013 at 02:57:51AM -0500, Ethan Reesor wrote: > >> On Mon, Feb 11, 2013 at 2:50 AM, Konstantin Khomoutov >> wrote: >>> What's wrong with >>> $ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare' >>> $ git push

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread Philip Oakley
From: "Philip Oakley" Sent: Friday, February 08, 2013 11:16 PM From: "Junio C Hamano" Sent: Friday, February 08, 2013 10:54 PM "Philip Oakley" writes: My initial https://github.com/PhilipOakley/git/commit/e6217d simply updates - N_("See 'git help ' for more information on a specific comman

[PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-12 Thread Brandon Casey
Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new footer is separated from the message body by a bla

Re: A good Git technique for referring back to original files

2013-02-12 Thread MikeW
Matthieu Moy grenoble-inp.fr> writes: > > MikeW yahoo.co.uk> writes: > > > Since git is so good at tracking file content, I wondered whether there was any > > technique using git that would simplify the back-referencing task. > > I'm not sure I understand the question, but if you want to add

[PATCH v4 12/12] Unify appending signoff in format-patch, commit and sequencer

2013-02-12 Thread Brandon Casey
There are two implementations of append_signoff in log-tree.c and sequencer.c, which do more or less the same thing. Unify on top of the sequencer.c implementation. Add a test in t4014 to demonstrate support for non-s-o-b elements in the commit footer provided by sequence.c:append_sob. Mark test

[PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Brandon Casey
--- This test tests the behavior of 'cherry-pick -s' of a commit with an empty commit message. I created the test when I noticed during my series that cherry-pick was adding a sob twice when a commit with an empty commit message was cherry-picked. I'm not sure we should apply this though. I'm l

[PATCH v4 10/12] t4014: more tests about appending s-o-b lines

2013-02-12 Thread Brandon Casey
From: Nguyễn Thái Ngọc Duy [bc: Squash the tests from Duy's original unify-appending-sob series. Fix test 90 "signoff: some random signoff-alike" and mark as failing. Correct behavior should insert a blank line after message body and signed-off-by. Add two additional tests:

[PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Brandon Casey
From: Nguyễn Thái Ngọc Duy This is a preparation step for merging with append_signoff from sequencer.c Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Brandon Casey Reviewed-by: Jonathan Nieder --- builtin/log.c | 13 + log-tree.c| 17 + revision.h| 2

[PATCH v4 08/12] sequencer.c: teach append_signoff how to detect duplicate s-o-b

2013-02-12 Thread Brandon Casey
Teach append_signoff how to detect a duplicate s-o-b in the commit footer. This is in preparation to unify the append_signoff implementations in log-tree.c and sequencer.c. Fixes test in t3511. Signed-off-by: Brandon Casey --- builtin/commit.c | 2 +- sequencer.c | 59

[PATCH v4 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-12 Thread Brandon Casey
Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new footer is separated from the message body by a bla

[PATCH v4 07/12] sequencer.c: always separate "(cherry picked from" from commit body

2013-02-12 Thread Brandon Casey
Start treating the "(cherry picked from" line added by cherry-pick -x the same way that the s-o-b lines are treated. Namely, separate them from the main commit message body with an empty line. Introduce tests to test this functionality. Signed-off-by: Brandon Casey Reviewed-by: Jonathan Nieder

  1   2   >