[[PATCH v2]] git-send-email: Added the ability to query the number of smtp password questions

2013-11-10 Thread silvio
From: Silvio F silvio.fri...@gmail.com With this patch git-send-mail ask a configurable number of questions to input the smtp password. Without this patch we have only one trial. Signed-off-by: Silvio F silvio.fri...@gmail.com --- Documentation/git-send-email.txt | 4 git-send-email.perl

[RFC/PATCH 1/4] repo-config: remove deprecated alias for git config

2013-11-10 Thread John Keeping
The release notes for Git 1.5.4 say that git repo-config will be removed in the next feature release. Since Git 2.0 is nearly here, remove it. Signed-off-by: John Keeping j...@keeping.me.uk --- .gitignore | 1 - Documentation/git-repo-config.txt | 23

[RFC/PATCH 3/4] lost-found: remove deprecated command

2013-11-10 Thread John Keeping
git lost-found has been deprecated since commit fc8b5f0 (Deprecate git-lost-found, 2007-11-08), included in version 1.5.4. Signed-off-by: John Keeping j...@keeping.me.uk --- .gitignore | 1 - Documentation/git-lost-found.txt | 74

[RFC/PATCH 0/4] Remove deprecated commands

2013-11-10 Thread John Keeping
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. John Keeping (4): repo-config: remove deprecated alias

[RFC/PATCH 4/4] peek-remote: remove deprecated alias of ls-remote

2013-11-10 Thread John Keeping
This has been deprecated since commit 87194d2 (Deprecate peek-remote, 2007-11-24), included in version 1.5.4. Signed-off-by: John Keeping j...@keeping.me.uk --- .gitignore | 1 - Documentation/git-peek-remote.txt | 43 -- Makefile

[RFC/PATCH 2/4] tar-tree: remove deprecated command

2013-11-10 Thread John Keeping
git tar-tree has been a thin wrapper around git archive since commit fd88d9c (Remove upload-tar and make git-tar-tree a thin wrapper to git-archive, 2006-09-24), which also made it print a message indicating that git-tar-tree is deprecated. Signed-off-by: John Keeping j...@keeping.me.uk ---

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

2013-11-10 Thread Ralf Thielow
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 --- po/de.po | 191 --- 1 file changed, 86 insertions(+), 105

Re: Request: timeout option for remote operations, esp. git fetch

2013-11-10 Thread Eric Wong
H. Peter Anvin h...@zytor.com wrote: When a remote server is unavailable or very slow, some git commands can stall out indefinitely. It would be a very good thing if remote commands -- but especially git fetch -- could be given a timeout. We've had SO_KEEPALIVE on git and ssh transports since

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

2013-11-10 Thread Richard Hansen
On 2013-10-29 04:41, Felipe Contreras wrote: Richard Hansen wrote: Signed-off-by: Richard Hansen rhan...@bbn.com --- git-remote-testgit.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh index 6d2f282..80546c1 100755

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

2013-11-10 Thread Ari Pollak
Hi, 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 the log messages get included in my own log message.

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

2013-11-10 Thread Ken Tanzer
I originally posted about this to the git-users list (https://groups.google.com/forum/#!topic/git-users/G5D0bldEbTo). If this would normally be expected to work: git add file git commit git rm file git commit git format-patch HEAD~1 git reset --hard HEAD~1 git am 0001*patch then I'm having a

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

2013-11-10 Thread Felipe Contreras
On Sun, Nov 10, 2013 at 4:46 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-10-29 04:41, Felipe Contreras wrote: Richard Hansen wrote: Signed-off-by: Richard Hansen rhan...@bbn.com --- git-remote-testgit.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git

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

2013-11-10 Thread Richard Hansen
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. Also, explicitly set push.default to simple to silence warnings when using --verbose. Signed-off-by: Richard Hansen

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

2013-11-10 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 0/7] remote-hg, remote-bzr fixes

2013-11-10 Thread Richard Hansen
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, test-hg.sh: prepare for change to

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

2013-11-10 Thread Richard Hansen
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 changed, 2 insertions(+) diff

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

2013-11-10 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 5/7] test-hg.sh: avoid obsolete 'test' syntax

2013-11-10 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 6/7] test-hg.sh: help user correlate verbose output with email test

2013-11-10 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 7/7] remote-bzr, remote-hg: fix email address regular expression

2013-11-10 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 +++

[PATCH] fixup! transport-helper: add 'force' to 'export' helpers

2013-11-10 Thread Richard Hansen
defend against force=foo in the user's environment Signed-off-by: Richard Hansen rhan...@bbn.com --- git-remote-testgit.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh index 6d2f282..1cfdea2 100755 --- a/git-remote-testgit.sh +++

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

2013-11-10 Thread Richard Hansen
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 a/contrib/remote-helpers/git-remote-bzr