Re: git with large files...

2012-07-21 Thread Elia Pinto
Well, many folks use puppet in serverless configuration pushing the manifest from a central git server via cron and applying locally the configuration fetched. In this sense git IS used for deployement. And, for a configuration management system as puppet this could be a sensible thing to do -

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Florian Achleitner
For some fast-import commands (e.g. cat-blob) an answer-channel is required. For this purpose a fifo (aka named pipe) (mkfifo) is created (.git/fast-import-report-fifo) by the transport-helper when fetch via import is requested. The remote-helper and fast-import open the ends of the pipe. The

Re: empty ident name trashes commit message

2012-07-21 Thread Ramana Kumar
If I forget to set user.email and user.name config options and do a commit (possibly the --amend option also required to make this show up), then git 1.7.11.2 will drops me into an editor for a commit message, then after that complain with the fatal message: *** Please tell me who you are.

Re: git with large files...

2012-07-21 Thread Martin Langhoff
On Fri, Jul 20, 2012 at 11:47 PM, David Aguilar dav...@gmail.com wrote: I'm not sure if it was the big files part that Randal was responding to. IIUC it was the using git for deployment part. Packaging tools (Makefiles, .rpm, .deb, etc) are a better suited for deploying software. Fair

Re: git with large files...

2012-07-21 Thread Martin Langhoff
On Sat, Jul 21, 2012 at 3:11 AM, Elia Pinto gitter.spi...@gmail.com wrote: Well, many folks use puppet in serverless configuration pushing the manifest from a central git server via cron and applying locally the configuration fetched. In this sense git IS used for deployement. And, for a

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: [Subject: Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.] Is this on top of patches 1, 2, and 3 from v2 of the series? *checks* Looks like it doesn't overlap with any of the files from those patches, so I don't have to understand

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Florian Achleitner
On Saturday 21 July 2012 09:48:34 Jonathan Nieder wrote: To sum up: I think we should just stick to pipes --- why all this fifo complication? People didn't like pipe variant (prexec_cb not being compatible to windows' process creation model), so I learned about fifos and implemented a (basic)

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
Florian Achleitner wrote: On Saturday 21 July 2012 09:48:34 Jonathan Nieder wrote: To sum up: I think we should just stick to pipes --- why all this fifo complication? People didn't like pipe variant (prexec_cb not being compatible to windows' process creation model), so I learned about

[PATCH 0/7] i18n for git-am, git-rebase and git-merge

2012-07-21 Thread Jiang Xin
Mark strings in git-am, git-rebase, and git-merge for translation. And contain fixes for shell gettext extraction and xgettext workaround. Jiang Xin (7): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark strings for translation i18n: Rewrite gettext messages start with

[PATCH 1/7] i18n: New keywords for xgettext extraction from sh

2012-07-21 Thread Jiang Xin
Since we have additional shell wrappers (gettextln and eval_gettextln) for gettext, we need to take into account these wrapers when run 'make pot' to extract messages from shell scripts. Signed-off-by: Jiang Xin worldhello@gmail.com --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1

[PATCH 3/7] i18n: Rewrite gettext messages start with dash

2012-07-21 Thread Jiang Xin
Gettext message in a shell script should not start with '-', one workaround is adding '--' between gettext and the message, like: gettext -- --exec option ... But due to a bug in the xgettext extraction, xgettext can not extract the actual message for this case. Rewrite the message is a

[PATCH 4/7] Remove obsolete LONG_USAGE which breaks xgettext

2012-07-21 Thread Jiang Xin
The obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will breaks xgettext when extract l10n messages. But if remove single quotes from the message, xgettext works fine on 'git-rebase.sh'. Since there is a mordern

[PATCH 5/7] i18n: am: mark more strings for translation

2012-07-21 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- git-am.sh | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/git-am.sh b/git-am.sh index b6a53..20c1a 100755 --- a/git-am.sh +++ b/git-am.sh @@ -92,7 +92,7 @@ safe_to_abort () { then return

[PATCH 6/7] Remove unused and bad gettext block from git-am

2012-07-21 Thread Jiang Xin
Gettext message should not start with '-' nor '--'. Since the '-d' and '--dotest' options are not exist in OPTIONS_SPEC variable, so it's safe to remove the block. Signed-off-by: Jiang Xin worldhello@gmail.com --- git-am.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-am.sh

[PATCH 7/7] i18n: merge-recursive: mark strings for translation

2012-07-21 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- merge-recursive.c | 152 +- 1 file changed, 81 insertions(+), 71 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 68093..d0167 100644 --- a/merge-recursive.c +++

Re: git with large files...

2012-07-21 Thread Elia Pinto
Sure . There is a complete paragraph creating decentralized puppet architecture in puppet 2.7 cookbook. I am also sure to have read the same topic on web on the site bitfieldconsulting.com , not casually : the book's author have his blog there. Sorry i have not the complete url now - old

Re: [RFC 4/4 v3] Add cat-blob report fifo from fast-import to remote-helper.

2012-07-21 Thread Jonathan Nieder
(adding msysgit list to cc for a Windows question) Hi, (regarding bidirectional communication between git and fast-import for remote helpers) Florian Achleitner wrote: People didn't like pipe variant (prexec_cb not being compatible to windows' process creation model), so I learned about fifos

Re: [PATCH 1/7] i18n: New keywords for xgettext extraction from sh

2012-07-21 Thread Stefano Lattarini
On 07/21/2012 05:50 PM, Jiang Xin wrote: Since we have additional shell wrappers (gettextln and eval_gettextln) for gettext, we need to take into account these wrapers s/wrapers/wrappers/ Regards, Stefano -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: [PATCH 4/7] Remove obsolete LONG_USAGE which breaks xgettext

2012-07-21 Thread Stefano Lattarini
On 07/21/2012 05:50 PM, Jiang Xin wrote: The obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will breaks xgettext when extract s/extract/extracting/ I think. l10n messages. But if remove single quotes from the

Re: [PATCH 5/7] i18n: am: mark more strings for translation

2012-07-21 Thread Stefano Lattarini
On 07/21/2012 05:50 PM, Jiang Xin wrote: Signed-off-by: Jiang Xin worldhello@gmail.com --- git-am.sh | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/git-am.sh b/git-am.sh index b6a53..20c1a 100755 --- a/git-am.sh +++ b/git-am.sh @@ -92,7 +92,7 @@

Re: [PATCH 6/7] Remove unused and bad gettext block from git-am

2012-07-21 Thread Stefano Lattarini
On 07/21/2012 05:50 PM, Jiang Xin wrote: Gettext message s/message/messages/ I think. should not start with '-' nor '--'. Since the '-d' and '--dotest' options are not exist s/are not/do not/ in OPTIONS_SPEC variable, s/OPTIONS_SPEC/the OPTIONS_SPEC/ so it's safe to remove the block.

[RFC/PATCH] t3300-*.sh: Fix a TAP parse error

2012-07-21 Thread Ramsay Jones
At present, running the t3300-*.sh test on cygwin looks like: $ cd t $ ./t3300-funny-names.sh ok 1 - setup # passed all 1 test(s) 1..1 # SKIP Your filesystem does not allow tabs in filenames $ Unfortunately, this is not valid TAP output, which prove notes as follows:

Re: [RFC/PATCH] t3300-*.sh: Fix a TAP parse error

2012-07-21 Thread Jonathan Nieder
(cc-ing Ævar, TAP wizard) Hi, Ramsay Jones wrote: $ ./t3300-funny-names.sh ok 1 - setup # passed all 1 test(s) 1..1 # SKIP Your filesystem does not allow tabs in filenames $ Unfortunately, this is not valid TAP output, which prove notes as follows: [...] Parse

Re: pushing branches

2012-07-21 Thread Junio C Hamano
Thiago Farina tfrans...@gmail.com writes: Do'h, now I can see the idiocy that I was doing. If I'm understanding this better, $ git push origin master tells git to push to remote origin, the contents of my master branch. Yes, add to the 'master' at the 'origin' at the end of the sentence and

Re: git with large files...

2012-07-21 Thread Nick
On 21/07/12 15:42, Martin Langhoff wrote: On Sat, Jul 21, 2012 at 3:11 AM, Elia Pinto gitter.spi...@gmail.com wrote: Well, many folks use puppet in serverless configuration pushing the manifest from a central git server via cron and applying locally the configuration fetched. In this sense git

Arguements

2012-07-21 Thread Peter Fridrich
Idea? I want to have an LCD display shield and an ethernet shield on an Arduino Mega 2560. Bending out pins 11 and 12 on the LCD shield is easy enough but it would be great if the pins the software uses could be set at run time as arguments in the procedure call. I suppose that somewhere the

[PATCH v2 0/7] i18n for git-am, git-rebase and git-merge

2012-07-21 Thread Jiang Xin
Mark strings in git-am, git-rebase, and git-merge for translation. And contain fixes for shell gettext extraction and xgettext workaround. Jiang Xin (7): i18n: New keywords for xgettext extraction from sh i18n: rebase: mark strings for translation i18n: Rewrite gettext messages start with

[PATCH v2 1/7] i18n: New keywords for xgettext extraction from sh

2012-07-21 Thread Jiang Xin
Since we have additional shell wrappers (gettextln and eval_gettextln) for gettext, we need to take into account these wrappers when run 'make pot' to extract messages from shell scripts. Signed-off-by: Jiang Xin worldhello@gmail.com Signed-off-by: Stefano Lattarini

[PATCH v2 2/7] i18n: rebase: mark strings for translation

2012-07-21 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- git-rebase.sh | 58 ++ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 1cd06..df5998 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@

[PATCH v2 3/7] i18n: Rewrite gettext messages start with dash

2012-07-21 Thread Jiang Xin
Gettext message in a shell script should not start with '-', one workaround is adding '--' between gettext and the message, like: gettext -- --exec option ... But due to a bug in the xgettext extraction, xgettext can not extract the actual message for this case. Rewriting the message is a

[PATCH v2 4/7] Remove obsolete LONG_USAGE which breaks xgettext

2012-07-21 Thread Jiang Xin
The obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will breaks xgettext when extracting l10n messages. But if single quotes are removed from the message, xgettext works fine on 'git-rebase.sh'. Since there is a modern

[PATCH v2 6/7] Remove unused and bad gettext block from git-am

2012-07-21 Thread Jiang Xin
Gettext message should not start with '-' nor '--'. Since the '-d' and '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to remove the block. Signed-off-by: Jiang Xin worldhello@gmail.com Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com --- git-am.sh | 3 --- 1

[PATCH v2 7/7] i18n: merge-recursive: mark strings for translation

2012-07-21 Thread Jiang Xin
Signed-off-by: Jiang Xin worldhello@gmail.com --- merge-recursive.c | 152 +- 1 file changed, 81 insertions(+), 71 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 68093..d0167 100644 --- a/merge-recursive.c +++

Re: [PATCH 6/7] Remove unused and bad gettext block from git-am

2012-07-21 Thread Jiang Xin
2012/7/22 Stefano Lattarini stefano.lattar...@gmail.com: s/message/messages/ I think. s/are not/do not/ This so is redundant, in light of the earlier Since. I'd just remove it. Thanks, Stefano. New series of patches are generated and sent to this list. -- Jiang Xin -- To unsubscribe from

Re: pushing branches

2012-07-21 Thread Thiago Farina
On Sat, Jul 21, 2012 at 4:33 PM, Junio C Hamano gits...@pobox.com wrote: Yes. Hence does not make sense to ask git to do push origin master while inside feature-work branch. No. As long as you know your master is ready and suitable to be published when you ask push, the command perfectly