Re: [PATCH] fast_export.c: Fix a compiler warning

2012-08-20 Thread Florian Achleitner
On Sunday 19 August 2012 16:29:02 Ramsay Jones wrote: In particular, gcc complains thus: CC vcs-svn/fast_export.o vcs-svn/fast_export.c: In function 'fast_export_begin_note': vcs-svn/fast_export.c:77: warning: long long unsigned int format, \ different type arg (arg

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

2012-08-20 Thread Florian Achleitner
On Saturday 18 August 2012 23:35:38 Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: [..] Just to show how, here is what I did just now. [..] Thanks. Thanks for you guidance! I'll base a new version on your fixups. Florian -- To unsubscribe from this list: send the line

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Florian Achleitner
On Sunday 19 August 2012 04:37:35 David Michael Barr wrote: On Sat, Aug 18, 2012 at 6:40 AM, Florian Achleitner florian.achleitner.2.6...@gmail.com wrote: Hi! This patch series should prepare vcs-svn/svndump.* for branch detection. When starting with this feature I found that the

Re: [PATCH] fast_export.c: Fix a compiler warning

2012-08-20 Thread Junio C Hamano
Florian Achleitner florian.achleitner.2.6...@gmail.com writes: If you need to re-roll your patches in the 'fa/remote-svn' branch, could you please squash this fix into them. [This was implemented on top of commit 2ce959ba, but you will probably want to make the equivalent change to commit

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

2012-08-20 Thread Junio C Hamano
Florian Achleitner florian.achleitner.2.6...@gmail.com writes: On Saturday 18 August 2012 23:35:38 Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: [..] Just to show how, here is what I did just now. [..] Thanks. Thanks for you guidance! I'll base a new version on your

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Junio C Hamano
Florian Achleitner florian.achleitner.2.6...@gmail.com writes: This change makes me uncomfortable. We are doubling up on hashing with fast-import. This introduces git-specific logic into vcs-svn. IIUC, vcs-svn/fast-export is meant to produce a stream in the fast-import format, and that format

What's cooking in git.git (Aug 2012, #06; Sun, 19)

2012-08-20 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'. Now 1.7.12 is out, we will have a few days of calming down period on the 'master' front, just in case we have to deal with brown paper bag

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

2012-08-20 Thread Erik Faye-Lund
On Mon, Aug 20, 2012 at 9:00 AM, Junio C Hamano gits...@pobox.com wrote: * ef/win32-cred-helper (2012-08-16) 1 commit - contrib: add win32 credential-helper Credential helper for Win32 (is this GUI???). No, and credential helpers shouldn't be either. -- To unsubscribe from this list: send

Re: read-cache-v5.c: compiler warnings

2012-08-20 Thread Thomas Gummerer
On 08/19, Ramsay Jones wrote: Hi Thomas, Just an FYI; two out of the three gcc compilers I use (Linux, cygwin but not MingW), issue the following warnings: CC read-cache-v5.o read-cache-v5.c: In function `write_index_v5': read-cache-v5.c:1011: warning: 'dir' might be used

RE: Porting git to HP NonStop

2012-08-20 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Sunday, August 19, 2012 7:23 PM To: Joachim Schmitz Cc: 'Shawn Pearce'; git@vger.kernel.org; rsbec...@nexbridge.com Subject: Re: Porting git to HP NonStop Joachim Schmitz j...@schmitz-digital.de writes: Found the problem: our

RE: git on HP NonStop

2012-08-20 Thread Joachim Schmitz
From: Jan Engelhardt [mailto:jeng...@inai.de] Sent: Sunday, August 19, 2012 6:26 PM To: Joachim Schmitz Cc: 'Junio C Hamano'; git@vger.kernel.org Subject: RE: git on HP NonStop On Tuesday 2012-08-14 17:52, Joachim Schmitz wrote: @@ -98,6 +99,11 @@ #include stdlib.h #include

Re: git on HP NonStop

2012-08-20 Thread Johannes Sixt
Am 8/20/2012 12:36, schrieb Joachim Schmitz: int var = var; char *othervar = othervar; ... What is the reason for using that self-init stuff? I don't think it is really portable, is it? It is used to avoid var may be used uninitialized warnings for some compilers. Officially (according

RE: git on HP NonStop

2012-08-20 Thread Joachim Schmitz
From: Johannes Sixt [mailto:j.s...@viscovery.net] Sent: Monday, August 20, 2012 12:57 PM To: Joachim Schmitz Cc: 'Jan Engelhardt'; 'Junio C Hamano'; git@vger.kernel.org Subject: Re: git on HP NonStop Am 8/20/2012 12:36, schrieb Joachim Schmitz: int var = var; char *othervar = othervar;

Re: [RFC 0/3] Reflogs for deleted refs: fix breakage and suggest namespace change

2012-08-20 Thread Alexey Muranov
Dear Junio, On 20 Aug 2012, at 02:26, Junio C Hamano wrote: We are not particularly interested in it is possible when many implementations can all trivially allow it to be possible; the question is what a sensible solution is among them, and I didn't find a directory with timestamp in its

Re: [RFC 0/3] Reflogs for deleted refs: fix breakage and suggest namespace change

2012-08-20 Thread Alexey Muranov
On 20 Aug 2012, at 13:32, Alexey Muranov wrote: The problem of mapping branch names to file paths looks to me very similar to the problem of mapping URLs to file paths for static web sites, so i would propose to use the same solution: add a special extension to distinguish a file from a

[PATCH 00/66] parseopt i18n marking (again)

2012-08-20 Thread Nguyễn Thái Ngọc Duy
There are not many changes since last time I sent this. A few new strings are introduced by new options, which are also marked. 'next' has some more, which causes conflicts but they should be easy to resolve. The last two patches are not really related to i18n. I looked at the marked strings and

[PATCH 01/66] i18n: mark style in OPT_COLUMN() for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse-options.h b/parse-options.h index 77a4a8b..71a39c6 100644 --- a/parse-options.h +++ b/parse-options.h @@ -238,6 +238,6 @@ extern int

[PATCH 02/66] i18n: archive: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 38 +++--- builtin/archive.c | 12 ++-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/archive.c b/archive.c index a484433..2584324 100644 --- a/archive.c +++

[PATCH 04/66] i18n: bisect--helper: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/bisect--helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8d325a5..e3884e3 100644 --- a/builtin/bisect--helper.c +++

[PATCH 05/66] i18n: blame: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 0d50273..c0c99c3 100644 --- a/builtin/blame.c +++

[PATCH 06/66] i18n: branch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/branch.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0e060f2..3f34101 100644 --- a/builtin/branch.c +++

[PATCH 07/66] i18n: cat-file: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/cat-file.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index af74e77..512072a 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -244,8

[PATCH 08/66] i18n: check-attr: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/check-attr.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 44c421e..e1ff575 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -8,19

[PATCH 09/66] i18n: checkout-index: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout-index.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index c16d82b..86b7d36 100644 --- a/builtin/checkout-index.c +++

[PATCH 10/66] i18n: checkout: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index d812219..9f6dbe6 100644 --- a/builtin/checkout.c +++

[PATCH 11/66] i18n: cherry: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ecc2793..dcd3e13 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1443,7 +1443,7 @@ static int

[PATCH 12/66] i18n: clean: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clean.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 0c7b3d0..69c1cda 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -16,7 +16,7 @@ static

[PATCH 13/66] i18n: clone: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/clone.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index e314b0b..5e8f3ba 100644 --- a/builtin/clone.c +++

[PATCH 14/66] i18n: column: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/column.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/column.c b/builtin/column.c index 5ea798a..e125a55 100644 --- a/builtin/column.c +++ b/builtin/column.c @@ -6,7 +6,7 @@ #include

[PATCH 15/66] i18n: commit: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 78 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 20cef95..33b78fe 100644 --- a/builtin/commit.c +++

[PATCH 16/66] i18n: config: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/config.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 8cd08da..41032cc 100644 --- a/builtin/config.c +++

[PATCH 17/66] i18n: count-objects: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/count-objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/count-objects.c b/builtin/count-objects.c index c37cb98..9afaa88 100644 --- a/builtin/count-objects.c +++ b/builtin/count-objects.c @@

[PATCH 18/66] i18n: describe: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/describe.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index 9f63067..9fe11ed 100644 --- a/builtin/describe.c +++ b/builtin/describe.c

[PATCH 19/66] i18n: fast-export: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/fast-export.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 9ab6db3..12220ad 100644 --- a/builtin/fast-export.c +++

[PATCH 20/66] i18n: fetch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/fetch.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index bb9a074..3f2ad77 100644 --- a/builtin/fetch.c +++

[PATCH 21/66] i18n: fmt-merge-msg: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/fmt-merge-msg.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 2c4d435..e2e27b2 100644 --- a/builtin/fmt-merge-msg.c +++

[PATCH 22/66] i18n: for-each-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/for-each-ref.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index b01d76a..afe83b9 100644 --- a/builtin/for-each-ref.c +++

[PATCH 23/66] i18n: format-patch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/log.c | 66 +-- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index dcd3e13..ba59110 100644 --- a/builtin/log.c +++

[PATCH 24/66] i18n: fsck: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/fsck.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index a710227..bb9a2cd 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -605,23 +605,23 @@

[PATCH 25/66] i18n: gc: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/gc.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/gc.c b/builtin/gc.c index 9b4232c..6d46608 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -19,7 +19,7 @@ #define FAILED_RUN failed to

[PATCH 26/66] i18n: grep: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/grep.c | 90 +- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 29adb0a..d73841c 100644 --- a/builtin/grep.c +++

[PATCH 27/66] i18n: hash-object: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/hash-object.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 33911fd..8d184f1 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c

[PATCH 28/66] i18n: help: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/help.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index efea4f5..bd86253 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -40,17 +40,17 @@ static int show_all =

[PATCH 29/66] i18n: init-db: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/init-db.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/init-db.c b/builtin/init-db.c index 244fb7f..78aa387 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -464,7 +464,7

[PATCH 30/66] i18n: log: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/log.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ba59110..1ff2d8d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -34,8 +34,8 @@ static const char

[PATCH 31/66] i18n: ls-files: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-files.c | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 31b3f2d..b5434af 100644 --- a/builtin/ls-files.c

[PATCH 32/66] i18n: ls-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-tree.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 6b666e1..235c17c 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -24,7

[PATCH 33/66] i18n: merge-base: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/merge-base.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 4f30f1b..2f223a6 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -23,9

[PATCH 34/66] i18n: merge-file: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/merge-file.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 6f0efef..c0570f2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c

[PATCH 35/66] i18n: merge: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/merge.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index dd50a0c..e9871ab 100644 --- a/builtin/merge.c +++

[PATCH 36/66] i18n: mktree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/mktree.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/mktree.c b/builtin/mktree.c index 4ae1c41..f92ba40 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -64,7 +64,7 @@ static void

[PATCH 37/66] i18n: mv: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/mv.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 2a144b0..034fec9 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -11,7 +11,7 @@ #include parse-options.h

[PATCH 38/66] i18n: name-rev: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/name-rev.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 1b37458..6238247 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@

[PATCH 39/66] i18n: notes: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/notes.c | 120 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 3644d14..423c6e8 100644 --- a/builtin/notes.c +++

[PATCH 40/66] i18n: pack-objects: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-objects.c | 64 +- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 782e7d0..5e14064 100644 ---

[PATCH 41/66] i18n: pack-refs: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/pack-refs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index 39a9d89..b5a0f88 100644 --- a/builtin/pack-refs.c +++ b/builtin/pack-refs.c @@ -3,7 +3,7 @@

[PATCH 42/66] i18n: prune-packed: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/prune-packed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c index b58a2e1..83382c1 100644 --- a/builtin/prune-packed.c +++ b/builtin/prune-packed.c @@

[PATCH 43/66] i18n: prune: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/prune.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/prune.c b/builtin/prune.c index b99b635..a9e2241 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -9,7 +9,7 @@ #include dir.h

[PATCH 44/66] i18n: push: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/push.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index fdfcc6c..4840bc2 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -11,7 +11,7

[PATCH 45/66] i18n: read-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/read-tree.c | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index df6c4c8..042ac1b 100644 --- a/builtin/read-tree.c +++

[PATCH 46/66] i18n: remote: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/remote.c | 84 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 920262d..8a670d8 100644 --- a/builtin/remote.c +++

[PATCH 47/66] i18n: replace: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/replace.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 4a8970e..e3aaf70 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -14,9 +14,9 @@

[PATCH 48/66] i18n: status: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/commit.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 33b78fe..feb43f4 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -35,7 +35,7 @@

[PATCH 49/66] i18n: rerere: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rerere.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 08213c7..dc1708e 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -8,7 +8,7 @@ #include

[PATCH 50/66] i18n: reset: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/reset.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 74442bd..915cc9f 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -22,9 +22,9 @@

[PATCH 51/66] i18n: rev-parse: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rev-parse.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 32788a9..bb3a516 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@

[PATCH 52/66] i18n: revert, cherry-pick: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/revert.c | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 82d1bf8..02ca95f 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@

[PATCH 53/66] i18n: rm: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/rm.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index 90c8a50..b384c4c 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -11,7 +11,7 @@ #include parse-options.h

[PATCH 54/66] i18n: shortlog: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/shortlog.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 37f3193..b316cf3 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -10,9 +10,9 @@

[PATCH 55/66] i18n: show-branch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/show-branch.c | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index a59e088..d208fd6 100644 --- a/builtin/show-branch.c

[PATCH 56/66] i18n: show-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/show-ref.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 3911661..4eb016d 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c

[PATCH 57/66] i18n: symbolic-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/symbolic-ref.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c index 801d62e..9e92828 100644 --- a/builtin/symbolic-ref.c +++ b/builtin/symbolic-ref.c @@

[PATCH 58/66] i18n: tag: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/tag.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index 7b1be85..c581e0a 100644 --- a/builtin/tag.c +++

[PATCH 59/66] i18n: update-index: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/update-index.c | 56 +- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 4ce341c..74986bf 100644 ---

[PATCH 60/66] i18n: update-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/update-ref.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 835c62a..b30394f 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -4,8

[PATCH 61/66] i18n: update-server-info: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/update-server-info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c index 0d63c44..6c8cc3e 100644 --- a/builtin/update-server-info.c +++

[PATCH 62/66] i18n: verify-pack: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/verify-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index e841b4a..66cd2df 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -53,7

[PATCH 63/66] i18n: verify-tag: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/verify-tag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 986789f..a8eee88 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -14,7 +14,7 @@

[PATCH 64/66] i18n: write-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/write-tree.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/write-tree.c b/builtin/write-tree.c index b223af4..084c0df 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -10,7

[PATCH 65/66] Reduce translations by using same terminologies

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Somewhere in help usage, we use both message and msg, command and cmd, key id and key-id. This patch makes all help text from parseopt use the first form. Clearer and 3 fewer strings for translators. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- archive.c | 2 +-

Re: Temporary merge branch 2 Conflicts

2012-08-20 Thread Stephen Bash
- Original Message - From: Junio C Hamano gits...@pobox.com Sent: Friday, August 17, 2012 5:10:47 PM Subject: Re: Temporary merge branch 2 Conflicts Stephen Bash b...@genarts.com writes: What is the recommended method for resolving this sort of merge? kdiff3 obviously doesn't

receive.denyNonNonFastForwards not denying force update

2012-08-20 Thread John Arthorne
At eclipse.org we wanted all git repositories to disallow non-fastforward commits by default. So, we set receive.denyNonFastForwards=true as a system configuration setting. However, this does not prevent a non-fastforward force push. If we set the same configuration setting in the local repository

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Florian Achleitner
On Sunday 19 August 2012 23:57:23 Junio C Hamano wrote: Florian Achleitner florian.achleitner.2.6...@gmail.com writes: This change makes me uncomfortable. We are doubling up on hashing with fast-import. This introduces git-specific logic into vcs-svn. IIUC, vcs-svn/fast-export is meant

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

2012-08-20 Thread Florian Achleitner
On Saturday 18 August 2012 13:13:47 Junio C Hamano wrote: That indicates that one necessary patch to add logic to Makefile to go and build that subdirectory, at least before running the test, but possibly as part of the all target, is missing, isn't it? Or you can add, at the beginning of

[PATCH 3/3] branch: suggest how to undo a --set-upstream when given one branch

2012-08-20 Thread Carlos Martín Nieto
This interface is error prone, and a better one (--set-upstream-to) exists. Suggest how to fix a --set-upstream invocation in case the user only gives one argument, which makes it likely that he meant to do the opposite, like with git branch --set-upstream origin/master when they meant one

[PATCH 2/3] branch: add --unset-upstream option

2012-08-20 Thread Carlos Martín Nieto
We have ways of setting the upstream information, but if we want to unset it, we need to resort to modifying the configuration manually. Teach branch an --unset-upstream option that unsets this information. Signed-off-by: Carlos Martín Nieto c...@elego.de --- Documentation/git-branch.txt | 5

[PATCH 0/3] Improve branch UI for setting upstream information

2012-08-20 Thread Carlos Martín Nieto
Hi all, After way too long, here's the next iteration of the concept that began with swapping arguments in --set-upstream like -m does. After the feedback from the list, --set-upstream-to was born and --set-upstream is being deprecated in favour of either --track or --set-upstream-to depening on

[PATCH 1/3] branch: introduce --set-upstream-to

2012-08-20 Thread Carlos Martín Nieto
The existing --set-uptream option can cause confusion, as it uses the usual branch convention of assuming a starting point of HEAD if none is specified, causing git branch --set-upstream origin/master to create a new local branch 'origin/master' that tracks the current branch. As

Re: Porting git to HP NonStop

2012-08-20 Thread Junio C Hamano
Joachim Schmitz j...@schmitz-digital.de writes: OK, I'll go for a compat/mkdir.c though. No. See below. We shouldn't call it tandem.c as Tandem, the Company, doesn't exist anymore and since more than a decade (bough by Compaq, then HP), only the __TANDEM survived in our compiler and

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

2012-08-20 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 9:00 AM, Junio C Hamano gits...@pobox.com wrote: * ef/win32-cred-helper (2012-08-16) 1 commit - contrib: add win32 credential-helper Credential helper for Win32 (is this GUI???). No, and credential helpers shouldn't be

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

2012-08-20 Thread Junio C Hamano
Florian Achleitner florian.achleitner.2.6...@gmail.com writes: On Saturday 18 August 2012 13:13:47 Junio C Hamano wrote: That indicates that one necessary patch to add logic to Makefile to go and build that subdirectory, at least before running the test, but possibly as part of the all

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

2012-08-20 Thread Erik Faye-Lund
On Mon, Aug 20, 2012 at 6:21 PM, Junio C Hamano gits...@pobox.com wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 9:00 AM, Junio C Hamano gits...@pobox.com wrote: * ef/win32-cred-helper (2012-08-16) 1 commit - contrib: add win32 credential-helper Credential helper

Re: git on HP NonStop

2012-08-20 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 8/20/2012 12:36, schrieb Joachim Schmitz: int var = var; char *othervar = othervar; ... What is the reason for using that self-init stuff? I don't think it is really portable, is it? It is used to avoid var may be used uninitialized

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

2012-08-20 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 6:21 PM, Junio C Hamano gits...@pobox.com wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 9:00 AM, Junio C Hamano gits...@pobox.com wrote: * ef/win32-cred-helper (2012-08-16) 1 commit - contrib:

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

2012-08-20 Thread Erik Faye-Lund
On Mon, Aug 20, 2012 at 6:35 PM, Junio C Hamano gits...@pobox.com wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 6:21 PM, Junio C Hamano gits...@pobox.com wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Mon, Aug 20, 2012 at 9:00 AM, Junio C Hamano

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

2012-08-20 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: What version would you prefer? I think git-remote-svn should move out of contrib to the toplevel of git.git (as I think I've mentioned before). Since it's just a new git command in incubation, I don't want the maintenance hassle of keeping it in contrib/svn-fe.

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Jonathan Nieder
Florian Achleitner wrote: Currently, the mark number is equal to the svn revision number the commit corresponds to. I didn't want to break that, but not mandatory. We could also split the mark namespace by reserving one or more of the most significant bits as a type specifier. I'll develop a

Re: Porting git to HP NonStop

2012-08-20 Thread Junio C Hamano
Joachim Schmitz j...@schmitz-digital.de writes: I haven't found any other to be needed. Well, poll, maybe, but with only minor tweaks for the win32 one works for me (and those tweaks are compatible with win32 A separate file, compat/tandem/mkdir.c, is fine, though. If you wouldn't have

Re: receive.denyNonNonFastForwards not denying force update

2012-08-20 Thread Junio C Hamano
John Arthorne arthorne.ecli...@gmail.com writes: For all the details see this bugzilla, particularly comment #59 where we finally narrowed this down: https://bugs.eclipse.org/bugs/show_bug.cgi?id=343150 What does at the system level in your does *not* work at the system level. exactly mean?

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

2012-08-20 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: OK, so is this a good description to go in the merge commit when it goes to 'master'? * ef/win32-cred-helper (2012-08-16) 1 commit - contrib: add win32 credential-helper Credential helper for Win32, to allow access to the keychain of

  1   2   >