Re*: mergetool: support --tool-help option like difftool does

2012-08-22 Thread Junio C Hamano
Junio C Hamano writes: > This way we do not have to risk the list of tools go out of sync > between the implementation and the documentation. > > Signed-off-by: Junio C Hamano > --- > Junio C Hamano writes: > >>> +--tool-help:: >>> + List the supported and available diff tools. >> >> This par

[PATCH] Make the ciabot scripts completely self-configuring in the normal case.

2012-08-22 Thread Eric S. Raymond
Signed-off-by: Eric S. Raymond --- contrib/ciabot/INSTALL | 26 +- contrib/ciabot/README| 11 --- contrib/ciabot/ciabot.py | 32 +--- contrib/ciabot/ciabot.sh | 40 ++-- 4 files changed,

[PATCH] Improved documentation for the ciabot scripts.

2012-08-22 Thread Eric S. Raymond
Signed-off-by: Eric S. Raymond --- contrib/ciabot/INSTALL | 39 +++ contrib/ciabot/README | 14 -- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 contrib/ciabot/INSTALL diff --git a/contrib/ciabot/INSTALL b/contrib/ciabo

Re: Feature request - discard hunk in add --patch mode

2012-08-22 Thread Mina Almasry
Well I actually didn't know about stash -p when I asked for this, but I still see room for us removing some more friction here: > # start from N-commit worth of change, debug and WIP > git stash save -p debug ;# stash away only the debugging aid > # now we have only N-commit worth of c

Re: Git to use XDG Base Directory Standard

2012-08-22 Thread David Aguilar
On Wed, Aug 22, 2012 at 2:44 PM, Carlos Martín Nieto wrote: > Lanoxx writes: > >> Hi, >> >> Git and Gitk are currently using the ~/.gitconfig and ~/.gitk files in >> the $HOME directory. It would be nice to use the XDG Base Directory >> standard for the location instead, see [1] and [2]. Are ther

Re: [PATCH] Make 'git submodule update --force' always check out submodules.

2012-08-22 Thread Junio C Hamano
Stefan Zager writes: > Currently, it will only do a checkout if the sha1 registered in the containing > repository doesn't match the HEAD of the submodule, regardless of whether the > submodule is dirty. As discussed on the mailing list, the '--force' flag is a > strong indicator that the state

Re: How to request a fast-forward pull

2012-08-22 Thread Ben Hutchings
On Tue, 2012-08-21 at 10:22 -0700, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, Aug 20, 2012 at 01:40:33PM -0700, Jonathan Nieder wrote: > > > >> > When you have a moment, would you please migrate this > >> > across to your main linux-stable repository? > >> > > >> > Both a branch and

[PATCH] Make 'git submodule update --force' always check out submodules.

2012-08-22 Thread Stefan Zager
Currently, it will only do a checkout if the sha1 registered in the containing repository doesn't match the HEAD of the submodule, regardless of whether the submodule is dirty. As discussed on the mailing list, the '--force' flag is a strong indicator that the state of the submodule is suspect, an

[PATCH] specifying ranges: we did not mean to make ".." an empty set

2012-08-22 Thread Junio C Hamano
Date: Mon, 2 May 2011 13:39:16 -0700 Either end of revision range operator can be omitted to default to HEAD, as in "origin.." (what did I do since I forked) or "..origin" (what did they do since I forked). But the current parser interprets ".." as an empty range "HEAD..HEAD", and worse yet, bec

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > I thought of having the function decclaration in git-compat-util.h, just > like for eg. setenv, gitmkdtemp, etc. Yeah, that's also fine, especially if you do not have to declare structures and constants. Once you start having to declare other things in order to decla

Re: Git to use XDG Base Directory Standard

2012-08-22 Thread Carlos Martín Nieto
Lanoxx writes: > Hi, > > Git and Gitk are currently using the ~/.gitconfig and ~/.gitk files in > the $HOME directory. It would be nice to use the XDG Base Directory > standard for the location instead, see [1] and [2]. Are there any > plans regarding this standard? Git does this starting at 1.7

Git to use XDG Base Directory Standard

2012-08-22 Thread Lanoxx
Hi, Git and Gitk are currently using the ~/.gitconfig and ~/.gitk files in the $HOME directory. It would be nice to use the XDG Base Directory standard for the location instead, see [1] and [2]. Are there any plans regarding this standard? Best Regards Lanoxx [1] http://standards.freedeskto

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 11:12 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org; rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > "Joachim Schmitz" writes: > > >> If it helps your port

Re: [PATCH] git-p4: Strip branch name prefixes if --use-client-spec enabled

2012-08-22 Thread Pete Wyckoff
casey.mcgi...@gmail.com wrote on Mon, 20 Aug 2012 13:43 -1000: > This removes the branch names from being included in the file system > path when using the both --use-client-spec and --detect-branches > options. > > Used alone, the --detect-branches option did the right thing, removing > the branc

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: >> If it helps your port, compat/itimer.c sounds like a good place. >> Doesn't it need a new header file to introduce structures and constants, > too? > > You mean the ITIMER_* and struct itimerval, right? > On NonStop these are available in , so here's no need to add >

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 11:02 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 > > "Joachim Schmitz" writes: > > >> > diff --git a/http.c b/http.c > >> > index

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 10:50 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org; rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > "Joachim Schmitz" writes: > > > Hi folks > > > > There another API missing on HP NonS

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: >> > diff --git a/http.c b/http.c >> > index b61ac85..18bc6bf 100644 >> > --- a/http.c >> > +++ b/http.c >> > @@ -806,10 +806,12 @@ static int http_request(const char *url, void >> > *result, int target, int options) >> >> Likewrapped X-< > > Any suggestion? Other than

Re: [PATCH v6 01/16] GSOC remote-svn

2012-08-22 Thread Junio C Hamano
Florian Achleitner writes: > Another improved series with fixups by Junio, and a little by me. > Diff: > - fix inconsistend indent in Documentation/git-remote-helpers.txt > - remove trailing newline in Makefile > - fix argument list and usage of regenerate_marks(void) in remote-svn.c > > > [PATCH

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > Hi folks > > There another API missing on HP NonStop and that is setitimer(), used in > progress.c and build/log.c > I do have a homebrewed implementation, on top of alarm(), it goes like this: > > #include "../git-compat-util.h" > #undef getitimer > #undef setitimer

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
Hi folks There another API missing on HP NonStop and that is setitimer(), used in progress.c and build/log.c I do have a homebrewed implementation, on top of alarm(), it goes like this: #include "../git-compat-util.h" #undef getitimer #undef setitimer int git_getitimer(int which, struct itimer

Re: git-log combining different detail levels

2012-08-22 Thread Jeff King
On Wed, Aug 22, 2012 at 09:25:06PM +0200, Maaartin-1 wrote: > Quite often I need to see some changes in more detail and others only > briefly, so I get some idea about the context. For example I'd like > something like merging the outputs of > > git log -p -S Bandersnatch > and > git log --name-s

[PATCH v2] precompompose_utf8.c: iconv_open_or_die

2012-08-22 Thread Torsten Bögershausen
Add the function iconv_open_or_die(), which is used in both readdir() and precompose_argv() Optimized away one save/restore of errnor, which is no longer nedded Signed-off-by: Torsten Bögershausen --- compat/precompose_utf8.c | 59 ++-- 1 file changed

RE: [PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact

2012-08-22 Thread Joachim Schmitz
> From: Joachim Schmitz [mailto:j...@schmitz-digital.de] > Sent: Wednesday, August 22, 2012 7:44 PM > To: 'Junio C Hamano' > Cc: 'git@vger.kernel.org'; 'Erik Faye-Lund'; 'Johannes Sixt'; 'Marius Storm- > Olsen' > Subject: RE: [PATCH] Support non-WIN32 system lacking poll() while keeping > the WIN32

Re: [PATCH 6/7] Fix tests under GETTEXT_POISON on git-remote

2012-08-22 Thread Junio C Hamano
Jiang Xin writes: > Maybe we should bypass all testcases which calling check_remote_track(). Sounds like it. -- 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

git-log combining different detail levels

2012-08-22 Thread Maaartin-1
Quite often I need to see some changes in more detail and others only briefly, so I get some idea about the context. For example I'd like something like merging the outputs of git log -p -S Bandersnatch and git log --name-status --oneline together, so I know better what happened. A simpler (an

Re: [PATCH] am: quote string for translation before passing to eval_gettextln

2012-08-22 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > If it's not quoted, the string is expanded before it gets looked up in > gettext database and obviously nothing is returned. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > ... > Yep. Verified. Also checked that no other places have this problem. > xgettext proba

[PATCH v6 13/16] remote-svn: add incremental import

2012-08-22 Thread Florian Achleitner
Search for a note attached to the ref to update and read it's 'Revision-number:'-line. Start import from the next svn revision. If there is no next revision in the svn repo, svnrdump terminates with a message on stderr an non-zero return value. This looks a little weird, but there is no other way

[PATCH v6 06/16] Add documentation for the 'bidi-import' capability of remote-helpers

2012-08-22 Thread Florian Achleitner
Signed-off-by: Florian Achleitner Signed-off-by: Junio C Hamano --- Documentation/git-remote-helpers.txt | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt index f5836e4..5ce4cda

[PATCH v6 11/16] Create a note for every imported commit containing svn metadata

2012-08-22 Thread Florian Achleitner
To provide metadata from svn dumps for further processing, e.g. branch detection, attach a note to each imported commit that stores additional information. The notes are currently hard-coded in refs/notes/svn/revs. Currently the following lines from the svn dump are directly accumulated in the no

[PATCH v6 09/16] Allow reading svn dumps from files via file:// urls

2012-08-22 Thread Florian Achleitner
For testing as well as for importing large, already available dumps, it's useful to bypass svnrdump and replay the svndump from a file directly. Add support for file:// urls in the remote url, e.g. svn::file:///path/to/dump When the remote helper finds an url starting with file:// it tries to

[PATCH v6 08/16] remote-svn, vcs-svn: Enable fetching to private refs

2012-08-22 Thread Florian Achleitner
The reference to update by the fast-import stream is hard-coded. When fetching from a remote the remote-helper shall update refs in a private namespace, i.e. a private subdir of refs/. This namespace is defined by the 'refspec' capability, that the remote-helper advertises as a reply to the 'capa

[PATCH v6 01/16] Implement a remote helper for svn in C

2012-08-22 Thread Florian Achleitner
Enable basic fetching from subversion repositories. When processing remote URLs starting with testsvn::, git invokes this remote-helper. It starts svnrdump to extract revisions from the subversion repository in the 'dump file format', and converts them to a git-fast-import stream using the function

[PATCH v6 01/16] GSOC remote-svn

2012-08-22 Thread Florian Achleitner
Another improved series with fixups by Junio, and a little by me. Diff: - fix inconsistend indent in Documentation/git-remote-helpers.txt - remove trailing newline in Makefile - fix argument list and usage of regenerate_marks(void) in remote-svn.c [PATCH v6 01/16] Implement a remote helper for sv

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 8:25 PM > To: Joachim Schmitz > Cc: 'Brandon Casey'; 'Shawn Pearce'; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > "Joachim Schmitz" writes: > > >> Nice. And we have

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 8:17 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 > > "Joachim Schmitz" writes: > > > > > This revert

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 11:33 AM, Junio C Hamano wrote: > Brandon Casey writes: > >> Perhaps something like: >> >> diff --git a/usage.c b/usage.c >> index a2a6678..2d0ff35 100644 >> --- a/usage.c >> +++ b/usage.c >> @@ -80,8 +80,15 @@ void NORETURN usage(const char *err) >> >> void NORETURN die(

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
Brandon Casey writes: > Perhaps something like: > > diff --git a/usage.c b/usage.c > index a2a6678..2d0ff35 100644 > --- a/usage.c > +++ b/usage.c > @@ -80,8 +80,15 @@ void NORETURN usage(const char *err) > > void NORETURN die(const char *err, ...) > { > + static int dying; > va_l

Re: [PATCH 66/66] Use imperative form in help usage to describe an action

2012-08-22 Thread Drew Northup
On Mon, Aug 20, 2012 at 8:32 AM, Nguyễn Thái Ngọc Duy wrote: > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > My guts tell me this is correct, but my English foundation is shaking > so I say "change in the name of consistency"! Your gut is working just fine. I haven't attempted to apply the pat

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
Brandon Casey writes: > On Wed, Aug 22, 2012 at 10:41 AM, Johannes Sixt wrote: >> Am 22.08.2012 19:00, schrieb Brandon Casey: >>> So I think the body of [compat_mkdir] can become >>> something like: >>> >>>if (len && dir[len-1] == '/') >>>dir = tmp_dir = xstrndup(dir, len-1); >> >>

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: >> Nice. And we have xmemdupz() would be even better as you followed-up. > > How's that one used? I forgot that we frown upon use of any x() wrapper in the compat/ layer as J6t mentioned. So probably something along these lines... int retval; char *di

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 11:09 AM, Brandon Casey wrote: > On Wed, Aug 22, 2012 at 10:41 AM, Johannes Sixt wrote: >> Don't use x* wrappers in the compat layer, at least not those that >> allocate memory: They behave unpredictably due to try_to_free_routine >> and may lead to recursive invocations.

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Johannes Sixt [mailto:j...@kdbg.org] > Sent: Wednesday, August 22, 2012 8:09 PM > To: Joachim Schmitz > Cc: 'Brandon Casey'; 'Junio C Hamano'; 'Shawn Pearce'; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > Am 22.08.20

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > > This reverts be22d92 (http: avoid empty error messages for some curl errors, > 2011-09-05) on platforms with older versions of libcURL. > > Signed-off-by: Joachim Schmitz > --- > http.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/http.c b/http.c > in

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 10:41 AM, Johannes Sixt wrote: > Am 22.08.2012 19:00, schrieb Brandon Casey: >> So I think the body of [compat_mkdir] can become >> something like: >> >>if (len && dir[len-1] == '/') >>dir = tmp_dir = xstrndup(dir, len-1); > > Don't use x* wrappers in the compa

Re: Porting git to HP NonStop

2012-08-22 Thread Johannes Sixt
Am 22.08.2012 20:02, schrieb Joachim Schmitz: >> From: Johannes Sixt [mailto:j...@kdbg.org] >> Don't use x* wrappers in the compat layer, at least not those that allocate >> memory: They behave unpredictably due to try_to_free_routine and may lead >> to recursive invocations. > > I was just follow

Re: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: >> Looks sane but it would be more readable to make this a small helper > function, >> so that we do not need to have #ifdef/#endif in the primary flow of the > code. > > Hmm, in compat/? Worth the effort fort hat single occrence? Compat/ is to have some systems that la

RE: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)

2012-08-22 Thread Joachim Schmitz
> From: Joachim Schmitz [mailto:j...@schmitz-digital.de] > Sent: Wednesday, August 22, 2012 7:53 PM > To: 'Junio C Hamano' > Cc: 'git@vger.kernel.org' > Subject: RE: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over > getrlimit(RLIMIT_NOFILE,...) > > > From: Junio C Hamano [mailto:gits...@pobox.com] > > S

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Johannes Sixt [mailto:j...@kdbg.org] > Sent: Wednesday, August 22, 2012 7:41 PM > To: Brandon Casey > Cc: Joachim Schmitz; Junio C Hamano; Shawn Pearce; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > Am 22.08.2012 1

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 7:30 PM > To: Brandon Casey > Cc: Joachim Schmitz; Shawn Pearce; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > Brandon Casey writes: > >

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 7:41 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 > > "Joachim Schmitz" writes: > > > Like this: > > > > > > This reverts be22d

Re: [Q] Comparing differences introduced by two commits?

2012-08-22 Thread Jonathan del Strother
On 22 August 2012 17:58, Junio C Hamano wrote: > Jonathan del Strother writes: > >> On 22 August 2012 13:10, Brian Foster wrote: >> ... >>> In the past I've done: >>> >>> diff <(git show A) <(git show B) >>> >>> which produces rather messy output but is Ok when dealing >>> with just one o

RE: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 7:23 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over > getrlimit(RLIMIT_NOFILE,...) > > "Joachim Schmitz" writes: > > > Signed-off-by: Joachim Schmitz

Re: [PATCH] Document the --done option.

2012-08-22 Thread Sverre Rabbelier
On Wed, Aug 22, 2012 at 10:38 AM, Junio C Hamano wrote: > "Eric S. Raymond" writes: > >> --- > > A forgotten Sign-off? > > Sverre, the text matches my understanding as well as what be56862 > (fast-import: introduce 'done' command, 2011-07-16) says it did. > Ack? Acked-by: Sverre Rabbelier --

Re: [PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: >> Do you really need to have both? I suspect "If you do not have a usable >> sys/poll.h, set NO_SYS_POLL_H" may be a simpler alternative, but there > must > > Hmm, Not having and not having poll() are different thinks, > aren't they? Ahh, OK, I forgot the other combi

RE: [PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 7:13 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org; Erik Faye-Lund; Johannes Sixt; Marius Storm-Olsen > Subject: Re: [PATCH] Support non-WIN32 system lacking poll() while keeping > the WIN32 part intact > > "

Re: Porting git to HP NonStop

2012-08-22 Thread Johannes Sixt
Am 22.08.2012 19:00, schrieb Brandon Casey: > So I think the body of [compat_mkdir] can become > something like: > >if (len && dir[len-1] == '/') >dir = tmp_dir = xstrndup(dir, len-1); Don't use x* wrappers in the compat layer, at least not those that allocate memory: They behave unp

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > Like this: > > > This reverts be22d92 (http: avoid empty error messages for some curl errors, > 2011-09-05) on platforms with older versions of libcURL. > > Signed-off-by: Joachim Schmitz > --- Perfect ;-) > http.c | 2 ++ > 1 file changed, 2 insertions(+) > >

Re: [PATCH] Document the --done option.

2012-08-22 Thread Junio C Hamano
"Eric S. Raymond" writes: > --- A forgotten Sign-off? Sverre, the text matches my understanding as well as what be56862 (fast-import: introduce 'done' command, 2011-07-16) says it did. Ack? > Documentation/git-fast-import.txt |8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) >

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> From: Brandon Casey [mailto:draf...@gmail.com] > Sent: Wednesday, August 22, 2012 7:23 PM > To: Joachim Schmitz > Cc: Junio C Hamano; Shawn Pearce; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > On Wed, Aug 22, 2012 at 10:18 AM, Joachim Schmitz > wrot

Re: Porting git to HP NonStop

2012-08-22 Thread Junio C Hamano
Brandon Casey writes: > On Wed, Aug 22, 2012 at 9:30 AM, Joachim Schmitz > wrote: > >> OK, so how about this: >> /usr/local/bin/diff -EBbu ./compat/mkdir.c.orig ./compat/mkdir.c >> --- ./compat/mkdir.c.orig 2012-08-21 05:02:11 -0500 >> +++ ./compat/mkdir.c2012-08-21 05:02:11 -0500 >> @

RE: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, August 22, 2012 7:19 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0 > > "Joachim Schmitz" writes: > > > Signed-off-by: Joachim Schmitz > > At the ve

Re: What's cooking in git.git (Aug 2012, #06; Tue, 21)

2012-08-22 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Wed, Aug 22, 2012 at 6:10 AM, Junio C Hamano wrote: >> * nd/i18n-parseopt-help (2012-08-20) 54 commits >> - i18n: shortlog: mark parseopt strings for translation >> ... >> - i18n: mark "style" in OPT_COLUMN() for translation >> >> A lot of i18n mark-up for the

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 10:18 AM, Joachim Schmitz wrote: >> From: Brandon Casey [mailto:draf...@gmail.com] >> Sent: Wednesday, August 22, 2012 7:01 PM >> To: Joachim Schmitz >> Cc: Junio C Hamano; Shawn Pearce; git@vger.kernel.org; >> rsbec...@nexbridge.com >> Subject: Re: Porting git to HP NonSto

Re: [PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > Signed-off-by: Joachim Schmitz > --- > sha1_file.c | 4 > 1 file changed, 4 insertions(+) > > diff --git a/sha1_file.c b/sha1_file.c > index af5cfbd..76714ad 100644 > --- a/sha1_file.c > +++ b/sha1_file.c > @@ -747,6 +747,9 @@ static int open_packed_git_1(struct

Re: [PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > Signed-off-by: Joachim Schmitz At the very least, please mention that this reverts be22d92 (http: avoid empty error messages for some curl errors, 2011-09-05) on platforms with older versions of libcURL. > --- > http.c | 2 ++ > 1 file changed, 2 insertions(+) > >

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> From: Brandon Casey [mailto:draf...@gmail.com] > Sent: Wednesday, August 22, 2012 7:01 PM > To: Joachim Schmitz > Cc: Junio C Hamano; Shawn Pearce; git@vger.kernel.org; > rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > On Wed, Aug 22, 2012 at 9:30 AM, Joachim Schmitz > wrote

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 10:00 AM, Brandon Casey wrote: > Also, we have xstrndup. So I think the body of your function can become > something like: > >if (len && dir[len-1] == '/') >dir = tmp_dir = xstrndup(dir, len-1); > >retval = mkdir(dir, mode); >free(tmp_dir); Actually, x

Re: [PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact

2012-08-22 Thread Junio C Hamano
"Joachim Schmitz" writes: > Signed-off-by: Joachim Schmitz > --- > Makefile| 18 ++ > compat/win32/poll.c | 8 ++-- > 2 files changed, 20 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 6b0c961..2af4db3 100644 > --- a/Makefile > +++ b/

Re: Porting git to HP NonStop

2012-08-22 Thread Brandon Casey
On Wed, Aug 22, 2012 at 9:30 AM, Joachim Schmitz wrote: > OK, so how about this: > /usr/local/bin/diff -EBbu ./compat/mkdir.c.orig ./compat/mkdir.c > --- ./compat/mkdir.c.orig 2012-08-21 05:02:11 -0500 > +++ ./compat/mkdir.c2012-08-21 05:02:11 -0500 > @@ -0,0 +1,24 @@ > +#include "../gi

Re: [Q] Comparing differences introduced by two commits?

2012-08-22 Thread Junio C Hamano
Jonathan del Strother writes: > On 22 August 2012 13:10, Brian Foster wrote: > ... >> In the past I've done: >> >> diff <(git show A) <(git show B) >> >> which produces rather messy output but is Ok when dealing >> with just one or two sets of A/B commits. I now have a >> large-ist set

Re: [PATCH 1/2] fetch/push: allow refs/*:refs/*

2012-08-22 Thread Junio C Hamano
Junio C Hamano writes: > Michael Haggerty writes: > ... >> * The second branch of the if is *never* executed. > else if (args.fetch_all && >(!args.depth || prefixcmp(ref->name, "refs/tags/") )) { > *newtail = ref; >

Re: [PATCH] Get ciabot configuration from git variables.

2012-08-22 Thread Junio C Hamano
Thanks, will update 'maint' with it. -- 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: [PATCH] Support generate poison .mo files for testing

2012-08-22 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +static void translate(const char *msg, struct strbuf *buf) > +{ > + const char *end = msg + strlen(msg); > + const char *text = "* GETTEXT POISON *"; > + int text_len = strlen(text); > + int t = 0; > + > + strbuf_reset(buf); > + /* preserve

RE: git on HP NonStop

2012-08-22 Thread Joachim Schmitz
> -Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Tuesday, August 21, 2012 4:06 AM > To: Joachim Schmitz > Cc: 'Johannes Sixt'; 'Jan Engelhardt'; git@vger.kernel.org > Subject: Re: git on HP NonStop > > "Joachim Schmitz" writes: > > > OK, so let's have a lo

RE: Porting git to HP NonStop

2012-08-22 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Monday, August 20, 2012 6:54 PM > To: Joachim Schmitz > Cc: 'Shawn Pearce'; git@vger.kernel.org; rsbec...@nexbridge.com > Subject: Re: Porting git to HP NonStop > > "Joachim Schmitz" writes: > > > I haven't found any other to be needed. W

Re: [PATCH] Support generate poison .mo files for testing

2012-08-22 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > But a better way could be > replacing "tracked" with "t r a c k e d". We know the rule so we can > recreate the that string from "tracked" in test_i18n*. Or reverse the > upper/lower case, whichever is easier for the recreation by test_i18n* That does not make much

Re: [Q] Comparing differences introduced by two commits?

2012-08-22 Thread Jonathan del Strother
On 22 August 2012 13:10, Brian Foster wrote: > > Hello, > > I have two commits A and B. They are on separate branches. > Commit A is a older version of B. I want to see what, if > any, differences there are between what commit A changes > and what commit B changes. (The relative positions o

[PATCH] Prefer sysconf(_SC_OPEN_MAX) over getrlimit(RLIMIT_NOFILE,...)

2012-08-22 Thread Joachim Schmitz
Signed-off-by: Joachim Schmitz --- sha1_file.c | 4 1 file changed, 4 insertions(+) diff --git a/sha1_file.c b/sha1_file.c index af5cfbd..76714ad 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -747,6 +747,9 @@ static int open_packed_git_1(struct packed_git *p) return error("

[PATCH] Don't use curl_easy_strerror prior to curl-7.12.0

2012-08-22 Thread Joachim Schmitz
Signed-off-by: Joachim Schmitz --- http.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/http.c b/http.c index b61ac85..18bc6bf 100644 --- a/http.c +++ b/http.c @@ -806,10 +806,12 @@ static int http_request(const char *url, void *result, int target, int options)

[PATCH] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact

2012-08-22 Thread Joachim Schmitz
Signed-off-by: Joachim Schmitz --- Makefile| 18 ++ compat/win32/poll.c | 8 ++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6b0c961..2af4db3 100644 --- a/Makefile +++ b/Makefile @@ -152,6 +152,11 @@ all:: # # Defi

Re: [PATCH 6/7] Fix tests under GETTEXT_POISON on git-remote

2012-08-22 Thread Jiang Xin
2012/8/22 Junio C Hamano : > Which part of the output from "git remote show" does this test > expect to be translated? Specifically, does "tracked" ever get > translated? > > It appears that _(" tracked") is indeed marked for translation in > the source, so how can we expect value in $actual be an

[PATCH] am: quote string for translation before passing to eval_gettextln

2012-08-22 Thread Nguyễn Thái Ngọc Duy
If it's not quoted, the string is expanded before it gets looked up in gettext database and obviously nothing is returned. Signed-off-by: Nguyễn Thái Ngọc Duy --- On Wed, Aug 22, 2012 at 9:17 PM, Jonathan Nieder wrote: > Nguyen Thai Ngoc Duy wrote: > >> which means git performed a lookup on

Re: eval_gettextln does not work correctly?

2012-08-22 Thread Jonathan Nieder
Nguyen Thai Ngoc Duy wrote: > which means git performed a lookup on that string. It is from git-am.sh: > > eval_gettextln "The copy of the patch that failed is found in: >$dotest/patch" Good catch. It should use single-quotes. -- To unsubscribe from this list: send the line "unsubscribe git"

Re: What's cooking in git.git (Aug 2012, #06; Tue, 21)

2012-08-22 Thread Nguyen Thai Ngoc Duy
On Wed, Aug 22, 2012 at 6:10 AM, Junio C Hamano wrote: > * nd/i18n-parseopt-help (2012-08-20) 54 commits > - i18n: shortlog: mark parseopt strings for translation > ... > - i18n: mark "style" in OPT_COLUMN() for translation > > A lot of i18n mark-up for the help text from "git -h". It's a 66 p

[PATCH] l10n: preserve trailing spaces in Vietnamese translation

2012-08-22 Thread Nguyễn Thái Ngọc Duy
The trailing spaces in msgid can be used to separate the next word. Accidentally removing it means we may see "On branchmaster" instead of "On branch master". While at it, remove trailing space in translation if the original one does not have it. Signed-off-by: Nguyễn Thái Ngọc Duy --- po/vi.po

Re: [PATCH] Support generate poison .mo files for testing

2012-08-22 Thread Nguyen Thai Ngoc Duy
On Wed, Aug 22, 2012 at 6:13 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> test-poisongen does a similar job to gettext poison feature except >> that it does it at build time. Gibberish .mo files are generated for >> all supported langauges and put in po/build/poison-locale. Targe

[Q] Comparing differences introduced by two commits?

2012-08-22 Thread Brian Foster
Hello, I have two commits A and B. They are on separate branches. Commit A is a older version of B. I want to see what, if any, differences there are between what commit A changes and what commit B changes. (The relative positions of two commits may also differ in the two branches; that i

Re: [PATCH 1/2] fetch/push: allow refs/*:refs/*

2012-08-22 Thread Junio C Hamano
Michael Haggerty writes: >> The remote side can also throw phony "I have this object, too, but >> not at a particular ref---this entry is only to let you know I have >> it, so that we can negotiate minimal transfer better" entries that >> are labelled with strings that do not begin with "refs/" a

Re: [PATCH] Support generate poison .mo files for testing

2012-08-22 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > test-poisongen does a similar job to gettext poison feature except > that it does it at build time. Gibberish .mo files are generated for > all supported langauges and put in po/build/poison-locale. Target > "poison-locale" is for this. What is the significance of

[PATCH] Document the --done option.

2012-08-22 Thread Eric S. Raymond
--- Documentation/git-fast-import.txt |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2620d28..9291ea0 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @

[PATCH] Get ciabot configuration from git variables.

2012-08-22 Thread Eric S. Raymond
These changes remove all need to modify the ciabot scripts for installation. Instead, per-project configuration can be dome via variables in a [ciabot] section of the config file. Also, correct for the new server address. Signed-off-by: Eric S. Raymond --- contrib/ciabot/ciabot.py | 161 ++

Re: [PATCH 1/2] fetch/push: allow refs/*:refs/*

2012-08-22 Thread Michael Haggerty
On 08/21/2012 07:37 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >>> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c >>> index 6207ecd..a3e3fa3 100644 >>> --- a/builtin/fetch-pack.c >>> +++ b/builtin/fetch-pack.c >>> @@ -546,7 +546,7 @@ static void filter_refs(struct ref **refs