RE: [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. This makes sense to me, but the tests are already passing for me. How are they failing for you? -- Felipe Contreras --

RE: [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: cd to the t/ subdirectory so that the user doesn't already have to be in the test directory to run these test scripts. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-bzr.sh | 1 + contrib/remote-helpers/test-hg.sh | 1 + 2 files

RE: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: Change 'git push' to 'git push -u remote branch' in one of the test-bzr.sh tests to ensure that the test continues to pass when the default value of push.default changes to simple. This makes sense. Also, explicitly set push.default to simple to silence warnings when

RE: [PATCH 4/7] test-hg.sh: eliminate 'local' bashism

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: Unlike bash, POSIX shell does not specify a 'local' command for declaring function-local variable scope. Except for IFS, the variable names are not used anywhere else in the script so simply remove the 'local'. For IFS, move the assignment to the 'read' command to

RE: [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: It's hard to tell which author conversion test failed when the email addresses look similar. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-hg.sh | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git

RE: [PATCH 7/7] remote-bzr, remote-hg: fix email address regular expression

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: Before, strings like foo@example.com would be converted to foo. b...@example.com when they should be unknown foo@example.com. Indeed. Thanks. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

RE: [PATCH 5/7] test-hg.sh: avoid obsolete 'test' syntax

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: The POSIX spec says that the '-a', '-o', and parentheses operands to the 'test' utility are obsolete extensions due to the potential for ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior. All right, if you say so. -- Felipe Contreras -- To

RE: [PATCH v5 12/10] remote-bzr: support the new 'force' option

2013-11-11 Thread Felipe Contreras
Richard Hansen wrote: Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/git-remote-bzr | 34 +- contrib/remote-helpers/test-bzr.sh| 22 +- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git

Re: [PATCH 00/86] replace prefixcmp() with has_prefix()

2013-11-11 Thread Andreas Ericsson
On 2013-11-09 08:05, Christian Couder wrote: Here is a big patch series to replace prefixcmp() with a new has_prefix() function. Seems like totally useless codechurn to me. Besides, prefixcmp() ties in nicely with strcmp() and memcmp() (and returns 0 on a match just like its namesakes),

Re: [PATCH v3] push: Enhance unspecified push default warning

2013-11-11 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: - In Git 2.0 the new push.default of 'simple' will push only the current\n - branch to the same remote branch used by git pull. A push will\n - only succeed if the remote and local branches have the same name.\n + In Git 2.0, Git will

Re: [PATCH v3] push: Enhance unspecified push default warning

2013-11-11 Thread Jonathan Nieder
Junio C Hamano wrote: Is everybody happy with this version? Looks good to me. 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.kernel.org/majordomo-info.html

Re: [PATCH v3] push: Enhance unspecified push default warning

2013-11-11 Thread Marc Branchaud
On 13-11-11 12:02 PM, Junio C Hamano wrote: Is everybody happy with this version? Looks good. M. -- 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

Re: [PATCH] git-fetch-pack uses URLs like git-fetch

2013-11-11 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: git fetch-pack allows [host:]directory to point out the source repository. Use the term repository, which is already used in git fetch or git pull to describe URLs supported by Git. Sign-off? --- Documentation/git-fetch-pack.txt | 15

Re: [PATCH 1/4] Minor grammatical fixes in git log man page

2013-11-11 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Jason St. John wrote: git-log.txt: grammatical fixes under --log-size option Thanks. [...] --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -56,10 +56,10 @@ Note that this affects all diff-based output types, e.g. those

Re: [PATCH 2/4] Emphasize options and force ASCIIDOC escaping of --

2013-11-11 Thread Junio C Hamano
Jason St. John jstj...@purdue.edu writes: rev-list-options.txt: replace e.g. `--foo` with '\--foo' rev-list-options.txt: emphasize, instead of quote, some option arguments (e.g. foo-option becomes 'foo-option') rev-list-options.txt: force ASCIIDOC escaping of -- (e.g. '--bar' becomes

Re: [PATCH v5 12/10] remote-bzr: support the new 'force' option

2013-11-11 Thread Richard Hansen
On 2013-11-11 06:51, Felipe Contreras wrote: Richard Hansen wrote: Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/git-remote-bzr | 34 +- contrib/remote-helpers/test-bzr.sh| 22 +- 2 files changed, 54

Re: [PATCH v5 12/10] remote-bzr: support the new 'force' option

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:12 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-11-11 06:51, Felipe Contreras wrote: def do_option(parser): global force _, key, value = parser.line.split(' ') I'm surprised you prefer this over 'key, val = parser[1:3]' or even '_, key, val =

Re: [RFC/PATCH 0/4] Remove deprecated commands

2013-11-11 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: git repo-config, git tar-tree, git lost-found and git peek-remote have all been deprecated since at least Git 1.5.4. With Git 2.0 approaching, I think that would be a good point to remove then completely, which is what this series does. Probably good

Re: [PATCH v4 12/10] git-remote-testgit: support the new 'force' option

2013-11-11 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: I think the convention is to align these: case $opt in force) The existing case statement in this file indents the patterns the same amount as the case statement, so this should be aligned to match. In general I rarely see the case patterns

Re: [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Richard Hansen
On 2013-11-11 06:04, Felipe Contreras wrote: Richard Hansen wrote: The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. This makes sense to me, but the tests are already passing for me. How are

Re: [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Richard Hansen wrote: cd to the t/ subdirectory so that the user doesn't already have to be in the test directory to run these test scripts. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-bzr.sh | 1 +

Re: [PATCH 0/7] remote-hg, remote-bzr fixes

2013-11-11 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: A handful of fixes for the git-remote-hg and git-remote-bzr remote helpers and their unit tests. Richard Hansen (7): remote-hg: don't decode UTF-8 paths into Unicode objects test-bzr.sh, test-hg.sh: allow running from any dir test-bzr.sh,

Re: [RFC/PATCH 0/4] Remove deprecated commands

2013-11-11 Thread John Keeping
On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: git repo-config, git tar-tree, git lost-found and git peek-remote have all been deprecated since at least Git 1.5.4. With Git 2.0 approaching, I think that would be a good point to

Re: [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:31 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Richard Hansen wrote: cd to the t/ subdirectory so that the user doesn't already have to be in the test directory to run these test scripts. Signed-off-by: Richard

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Junio C Hamano
Ken Tanzer ken.tan...@gmail.com writes: ASCII text, with very long lines, with CRLF, CR, LF line terminators I am not very much surprised if such a file misbehaves, because the format-patch | am pipeline is designed to be used on patches that can be transferred in plain-text e-mail safely.

Re: [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 12:30 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-11-11 06:04, Felipe Contreras wrote: Richard Hansen wrote: The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again.

Re: [RFC/PATCH 0/4] Remove deprecated commands

2013-11-11 Thread Jonathan Nieder
John Keeping wrote: On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: git repo-config, git tar-tree, git lost-found and git peek-remote have all been deprecated since at least Git 1.5.4. [...] Probably good material to discuss during the

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:04, Junio C Hamano wrote: Ken Tanzer ken.tan...@gmail.com writes: ASCII text, with very long lines, with CRLF, CR, LF line terminators I am not very much surprised if such a file misbehaves, because the format-patch | am pipeline is designed to be used on patches that can

Re: [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Richard Hansen
On 2013-11-11 06:42, Felipe Contreras wrote: Richard Hansen wrote: It's hard to tell which author conversion test failed when the email addresses look similar. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-hg.sh | 20 ++-- 1 file changed, 10

Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Richard Hansen
On 2013-11-11 06:37, Felipe Contreras wrote: Richard Hansen wrote: Change 'git push' to 'git push -u remote branch' in one of the test-bzr.sh tests to ensure that the test continues to pass when the default value of push.default changes to simple. This makes sense. Also, explicitly set

Re: [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-11-11 06:42, Felipe Contreras wrote: Richard Hansen wrote: It's hard to tell which author conversion test failed when the email addresses look similar. Signed-off-by: Richard Hansen rhan...@bbn.com ---

Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen rhan...@bbn.com wrote: @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' git add content git commit -m one git remote add bzr bzr::../bzrrepo - git push bzr + git push -u bzr master

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed, that would immediately violate safecrlf, so failing the application sounds like the right

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:37, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed, that would immediately violate safecrlf,

Re: [PATCH] git-fetch-pack uses URLs like git-fetch

2013-11-11 Thread Torsten Bögershausen
On 2013-11-11 18.44, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: git fetch-pack allows [host:]directory to point out the source repository. Use the term repository, which is already used in git fetch or git pull to describe URLs supported by Git. Sign-off? Sorry,

Re: [PATCH] git-fetch-pack uses URLs like git-fetch

2013-11-11 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 2013-11-11 18.44, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: git fetch-pack allows [host:]directory to point out the source repository. Use the term repository, which is already used in git fetch or git pull to describe

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:43, Stefan Beller wrote: On 11.11.2013 20:37, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed,

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Hi Ari, Am 10.11.2013 22:49, schrieb Ari Pollak: I'm using git 1.8.4.2, and I've set the diff.submodule = log option globally. If I change the revision that a submodule is set to, then run git commit -av, The submodule shortlog is appended to the log message without any #s before it, so

Re: [PATCH] git-remote-mediawiki: do not remove installed files in clean target

2013-11-11 Thread Jonathan Nieder
Matthieu Moy wrote: Jonathan Nieder jrnie...@gmail.com writes: Running make clean after a successful make install should not result in a broken mediawiki remote helper. Acked-by: Matthieu Moy matthieu@imag.fr Thanks for looking it over. Here are a few more makefile tweaks on top of

[PATCH 2/3] git-remote-mediawiki build: make 'install' command configurable

2013-11-11 Thread Jonathan Nieder
On some machines, the most usable 'install' tool is named 'ginstall'. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- contrib/mw-to-git/Makefile | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile index

[PATCH 1/3] git-remote-mediawiki: honor DESTDIR in make install

2013-11-11 Thread Jonathan Nieder
So now you can run DESTDIR=$(pwd)/tmp make -Ccontrib/mw-to-git install to install the mediawiki remote helper, git-mw tool, and Git::Mediawiki perl module under tmp/ as preparation for zipping it up and extracting on another machine. While at it, make sure the directory that should

[PATCH 3/3] git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace

2013-11-11 Thread Jonathan Nieder
Quote DESTDIR and INSTLIBDIR for the shell in the same way as is done in the toplevel Makefile to avoid confusion in case they contain shell metacharacters. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- contrib/mw-to-git/Makefile | 6 -- 1 file changed, 4 insertions(+), 2

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Ari Pollak
Jens Lehmann writes: And after adding a modified file the log message also shows the diff of that file (and without leading # s too), so I doubt that diffs aren't normally included in the commit message with -v. What am I missing? Ah, it is true that -v normally does not prefix the diffs with

Re: [PATCH v3] l10n: de.po: translate 68 new messages

2013-11-11 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes: Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com Acked-by: Thomas Rast t...@thomasrast.ch Thanks for your work! -- Thomas Rast

[PATCH] submodule update: remove unnecessary orig_flags variable

2013-11-11 Thread Jens Lehmann
cmd_update() in the submodule script tries to preserve the options given on the command line in the orig_flags variable to pass them on into the recursion when the '--recursive' option is given. But this isn't necessary because all the variables set by the options will be seen in the recursion too

Re: [RFC/PATCH 0/4] Remove deprecated commands

2013-11-11 Thread John Keeping
On Mon, Nov 11, 2013 at 11:13:45AM -0800, Jonathan Nieder wrote: John Keeping wrote: On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: git repo-config, git tar-tree, git lost-found and git peek-remote have all been deprecated since

Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Richard Hansen
On 2013-11-11 14:31, Felipe Contreras wrote: On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen rhan...@bbn.com wrote: @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' git add content git commit -m one git remote add bzr bzr::../bzrrepo - git

Re: [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Richard Hansen
On 2013-11-11 14:29, Felipe Contreras wrote: On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-11-11 06:42, Felipe Contreras wrote: Richard Hansen wrote: It's hard to tell which author conversion test failed when the email addresses look similar. Signed-off-by:

Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 3:16 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-11-11 14:31, Felipe Contreras wrote: On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen rhan...@bbn.com wrote: @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' git add content git

Re: [PATCH] git-remote-mediawiki: do not remove installed files in clean target

2013-11-11 Thread Matthieu Moy
Jonathan Nieder jrnie...@gmail.com writes: Matthieu Moy wrote: Jonathan Nieder jrnie...@gmail.com writes: Running make clean after a successful make install should not result in a broken mediawiki remote helper. Acked-by: Matthieu Moy matthieu@imag.fr Thanks for looking it over.

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Am 11.11.2013 21:48, schrieb Ari Pollak: Jens Lehmann writes: And after adding a modified file the log message also shows the diff of that file (and without leading # s too), so I doubt that diffs aren't normally included in the commit message with -v. What am I missing? Ah, it is true that

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Am 11.11.2013 22:29, schrieb Jens Lehmann: And while testing this issue I noticed another problem: When using git commit -a not only the staged commits of a submodule get committed, but also the unstaged commits. Will look into that too. Ok, scrap that. This is exactly what is expected. -- To

Re: What's cooking in git.git (Nov 2013, #01; Fri, 1)

2013-11-11 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Commit ad24a30ef (fast-export: add new --refspec option, 31-10-2013) causes sparse to complain: SP builtin/fast-export.c builtin/fast-export.c:739:55: warning: Variable length array is used. Do we want to use this C99 feature? Good eyes,

[PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Felipe Contreras
Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. Small changes since v5: diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

[PATCH v6 01/10] transport-helper: fix extra lines

2013-11-11 Thread Felipe Contreras
Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Felipe Contreras
So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 32 t/t9350-fast-export.sh| 7 +++ 3 files changed, 43

[PATCH v6 05/10] fast-export: improve argument parsing

2013-11-11 Thread Felipe Contreras
We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

[PATCH v6 10/10] transport-helper: add support to delete branches

2013-11-11 Thread Felipe Contreras
For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh

[PATCH v6 08/10] fast-import: add support to delete refs

2013-11-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git

[PATCH v6 09/10] fast-export: add support to delete refs

2013-11-11 Thread Felipe Contreras
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++ 2 files changed, 25 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index cf745ec..4b76222 100644 ---

[PATCH v6 03/10] transport-helper: add 'force' to 'export' helpers

2013-11-11 Thread Felipe Contreras
Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen rhan...@bbn.com Documentation-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/gitremote-helpers.txt | 4

[PATCH v6 02/10] transport-helper: don't update refs in dry-run

2013-11-11 Thread Felipe Contreras
The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b66c7fd..9558a0d 100644 ---

[PATCH v6 07/10] transport-helper: add support for old:new refspec

2013-11-11 Thread Felipe Contreras
By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh

What's cooking in git.git (Nov 2013, #03; Mon, 11)

2013-11-11 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'. You can find the changes described here in the integration branches of the repositories listed at

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jeff King
On Mon, Nov 11, 2013 at 10:29:25PM +0100, Jens Lehmann wrote: The diff below fixes the problem you describe for me. (But I do not consider it a worthwhile fix in its current form because a line starting with Submodule might appear in a perfectly normal commit message, while diff --git most

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. How are you sending your patches? The

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I thought that the discussion agreed this option should not be called --refspec but something like --refmap? -- To unsubscribe

Re: [PATCH v6 03/10] transport-helper: add 'force' to 'export' helpers

2013-11-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen rhan...@bbn.com Documentation-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Didn't

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Small changes since v5: diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 8ed41b4..4b76222 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv,

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:33 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting

Re: [PATCH v6 03/10] transport-helper: add 'force' to 'export' helpers

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:28 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen rhan...@bbn.com Documentation-by: Richard Hansen rhan...@bbn.com

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Felipe Contreras
On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I thought that the discussion agreed this option should

Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

2013-11-11 Thread Ramkumar Ramachandra
Junio C Hamano gits...@pobox.com wrote: $ git show -s --format='%CredAnd%CyellowAreNotTheSameColor' Ouch, this is quite a disaster. It would have been much saner if we started from %(color:yellow), %(subject), etc., i.e. have a single long-hand magic introducer %(...), and added a set of

Re: [PATCH 5/7] test-hg.sh: avoid obsolete 'test' syntax

2013-11-11 Thread Richard Hansen
On 2013-11-11 06:44, Felipe Contreras wrote: Richard Hansen wrote: The POSIX spec says that the '-a', '-o', and parentheses operands to the 'test' utility are obsolete extensions due to the potential for ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior. All right, if

[PATCH v2 3/9] test-bzr.sh, test-hg.sh: allow running from any dir

2013-11-11 Thread Richard Hansen
Set TEST_DIRECTORY to the t/ directory (if TEST_DIRECTORY is not already set) so that the user doesn't already have to be in the test directory to run these test scripts. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-bzr.sh | 3 ++-

[PATCH v2 1/9] remote-hg: don't decode UTF-8 paths into Unicode objects

2013-11-11 Thread Richard Hansen
The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH v2 6/9] test-hg.sh: avoid obsolete 'test' syntax

2013-11-11 Thread Richard Hansen
The POSIX spec says that the '-a', '-o', and parentheses operands to the 'test' utility are obsolete extensions due to the potential for ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-hg.sh | 2

[PATCH v2 8/9] test-hg.sh: help user correlate verbose output with email test

2013-11-11 Thread Richard Hansen
It's hard to tell which author conversion test failed when the email addresses look similar. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-hg.sh | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git

[PATCH v2 2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path

2013-11-11 Thread Richard Hansen
If $TEST_DIRECTORY is specified in the environment, convert the value to an absolute path to ensure that it remains valid even when 'cd' is used. Signed-off-by: Richard Hansen rhan...@bbn.com --- t/test-lib.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh

[PATCH v2 5/9] test-hg.sh: eliminate 'local' bashism

2013-11-11 Thread Richard Hansen
Unlike bash, POSIX shell does not specify a 'local' command for declaring function-local variable scope. Except for IFS, the variable names are not used anywhere else in the script so simply remove the 'local'. For IFS, move the assignment to the 'read' command to prevent it from affecting code

[PATCH v2 0/9] remote-hg, remote-bzr fixes

2013-11-11 Thread Richard Hansen
A handful of fixes for the git-remote-hg and git-remote-bzr remote helpers and their unit tests. Changes from v1: diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index ea597b0..1e53ff9 100755 --- a/contrib/remote-helpers/test-bzr.sh +++

[PATCH v2 7/9] test-hg.sh: fix duplicate content strings in author tests

2013-11-11 Thread Richard Hansen
beta was used twice. Change the second copy to gamma and increment the remaining content strings. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-hg.sh | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git

[PATCH v2 4/9] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple

2013-11-11 Thread Richard Hansen
Change 'git push remote' to 'git push remote branch' in one of the test-bzr.sh tests to ensure that the test continues to pass when the default value of push.default changes to simple. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/test-bzr.sh | 2 +- 1 file changed, 1

[PATCH v2 9/9] remote-bzr, remote-hg: fix email address regular expression

2013-11-11 Thread Richard Hansen
Before, strings like foo@example.com would be converted to foo. b...@example.com when they should be unknown foo@example.com. Signed-off-by: Richard Hansen rhan...@bbn.com --- contrib/remote-helpers/git-remote-bzr | 7 +++ contrib/remote-helpers/git-remote-hg | 7 +++

Re: [PATCH v2 2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path

2013-11-11 Thread Richard Hansen
On 2013-11-12 00:54, Richard Hansen wrote: If $TEST_DIRECTORY is specified in the environment, convert the value to an absolute path to ensure that it remains valid even when 'cd' is used. Signed-off-by: Richard Hansen rhan...@bbn.com Actually, credit for this and the next patch should go

Re: [PATCH v4 12/10] git-remote-testgit: support the new 'force' option

2013-11-11 Thread Richard Hansen
On 2013-11-11 13:28, Junio C Hamano wrote: Richard Hansen rhan...@bbn.com writes: I think the convention is to align these: case $opt in force) The existing case statement in this file indents the patterns the same amount as the case statement, so this should be aligned to match. In

Re: [PATCH 00/86] replace prefixcmp() with has_prefix()

2013-11-11 Thread Christian Couder
On Sat, Nov 9, 2013 at 3:24 PM, Thomas Rast t...@thomasrast.ch wrote: Christian Couder chrisc...@tuxfamily.org writes: Christian Couder (86): strbuf: add has_prefix() to be used instead of prefixcmp() diff: replace prefixcmd() with has_prefix() fast-import: replace prefixcmd() with

Re: [PATCH v6 00/10] transport-helper: updates

2013-11-11 Thread Richard Hansen
On 2013-11-11 17:54, Felipe Contreras wrote: Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. Small changes since v5: diff --git

[PATCH v2] remote-bzr: support the new 'force' option

2013-11-11 Thread Richard Hansen
Signed-off-by: Richard Hansen rhan...@bbn.com --- This is a reroll of: http://article.gmane.org/gmane.comp.version-control.git/237607 based on feedback from Felipe: http://article.gmane.org/gmane.comp.version-control.git/237615 This patch is an optional extension to Felipe's

[GIT PULL] l10n updates for 1.8.5 round 1

2013-11-11 Thread Jiang Xin
Hi, Junio Please pull l10n updates for Git 1.8.5 round 1. The following changes since commit aa2706463fdeb51d6f9d0e267113b251888cf7f5: Update draft release notes to 1.8.5 (2013-11-01 08:14:52 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you

Re: [PATCH v6 06/10] fast-export: add new --refspec option

2013-11-11 Thread Richard Hansen
On 2013-11-11 18:50, Felipe Contreras wrote: On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I thought

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Johannes Sixt
Am 11.11.2013 22:29, schrieb Jens Lehmann: The diff below fixes the problem you describe for me. (But I do not consider it a worthwhile fix in its current form because a line starting with Submodule might appear in a perfectly normal commit message, while diff --git most probably won't).