Re: [PATCH] remote: unify main and subcommand usage strings

2013-11-03 Thread Jiang Xin
2013/11/3 Thomas Rast t...@thomasrast.ch: We had separate usages for each subcommand, and for the main command, even though the latter is essentially a concatenation of all of the former. This leads to a lot of duplication and unnecessary differences, e.g., in the 'set-head' case the two

Re: Re* [BUG?] error: cache entry has null sha1

2013-11-03 Thread Jeff King
On Fri, Nov 01, 2013 at 03:44:52PM -0700, Junio C Hamano wrote: Here is a proposed endgame for the topic in a patch form, then. I've added a test for low-level read-tree --reset -u A B, and tried the am --abort I saw the problem with manually, but other than that, I haven't (re)thought

Re: [PATCH] remote: unify main and subcommand usage strings

2013-11-03 Thread Jiang Xin
2013/11/3 Jiang Xin worldhello@gmail.com: 2013/11/3 Thomas Rast t...@thomasrast.ch: Note that this patch changes the usage strings for the following subcommands: Differences of git-remote usages after applied your patch. diff -u before/git-remote-add-usage after/git-remote-add-usage

Re: [PATCH 2/3] Windows: a test_cmp that is agnostic to random LF CRLF conversions

2013-11-03 Thread Johannes Sixt
Am 02.11.2013 21:47, schrieb Sebastian Schuberth: So maybe it's a good point now to also change the MINGW prerequisite name to MSYS as part of your patch, and then name the functions more appropriately? It's too late. The series is already in master, and I see no point in a follow-up patch of

git svn fetch stops at revision 1485500

2013-11-03 Thread Stephan Classen
I hope this is the right place to post this. When trying to fetch a very large svn using git svn it always terminates at commit 1485500. this is easily reproducible: git svn init -s https://svn.apache.org/repos/asf/onami/trunk git svn fetch -r 148:HEAD The commit 1485500 is not in the

[PATCH] Change sed i\ usage to something Solaris' sed can handle

2013-11-03 Thread Ben Walton
Solaris' sed was choking on the i\ commands used in t4015-diff-whitespace as it couldn't parse the program properly. Modify two uses of sed that worked in GNU sed but not Solaris' (/usr/bin or /usr/xpg4/bin) to an equivalent form that is handled properly by both. Signed-off-by: Ben Walton

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

2013-11-03 Thread Greg Jacobson
Is there anything I could do to improve this patch? Thank you. On Fri, Oct 4, 2013 at 10:20 AM, Greg Jacobson coder5...@gmail.com wrote: When the unset push.default warning message is displayed this may be the first time many users encounter push.default. Modified the warning message to

[PATCH 2/8] git-sh-setup.sh: add variable to use the stuck-long mode

2013-11-03 Thread Nicolas Vigier
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- contrib/examples/git-checkout.sh | 1 + contrib/examples/git-clean.sh| 1 + contrib/examples/git-clone.sh| 1 +

[PATCH 1/8] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Documentation/git-cherry-pick.txt | 7 ++- Documentation/git-revert.txt | 6 +- builtin/revert.c | 2 ++ sequencer.c | 7 +++ sequencer.h | 2 ++ 5 files changed,

Adding --gpg-sign to cherry-pick, revert, am, rebase

2013-11-03 Thread Nicolas Vigier
Hello, Here is a series of patches to add the --gpg-sign option to be able to gpg sign commits, to the cherry-pick, revert, am and rebase commands. Nicolas -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

[PATCH 5/8] rebase: remove useless arguments check

2013-11-03 Thread Nicolas Vigier
Remove a check on the number of arguments for --onto and -x options. It is not possible for $# to be = 2 at this point : - if --onto or -x has an argument, git rev-parse --parseopt will provide something like this : set -- --onto 'x' -- when parsing the --onto option, $# will be 3 or

[PATCH 8/8] rebase: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Documentation/git-rebase.txt | 4 git-rebase--am.sh| 8 +--- git-rebase--interactive.sh | 32 git-rebase--merge.sh | 2 +- git-rebase.sh| 11 +++ 5

[PATCH 3/8] am: parse options in stuck-long mode

2013-11-03 Thread Nicolas Vigier
There is no functionnal change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- git-am.sh | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/git-am.sh

[PATCH 7/8] rebase: parse options in stuck-long mode

2013-11-03 Thread Nicolas Vigier
There is no functionnal change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- git-rebase.sh | 50 ++ 1 file changed, 22 insertions(+), 28

[PATCH 4/8] am: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Documentation/git-am.txt | 6 +- git-am.sh| 9 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 54d8461d61b2..17924d0f3ff3 100644 ---

git status: minor output format error

2013-11-03 Thread Wolfgang Rohdewald
git version 1.8.3.2 git status in German says (extract) # geändert: kajongg.py # gelöscht:playfield.py as you can see, there is one space too much before playfield.py LANG=C git status is correct: # modified: kajongg.py # deleted:playfield.py so it seems

Re: [PATCH 1/8] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread brian m. carlson
On Sun, Nov 03, 2013 at 04:54:17PM +0100, Nicolas Vigier wrote: diff --git a/sequencer.h b/sequencer.h index 1fc22dcabe13..db43e9cf86dc 100644 --- a/sequencer.h +++ b/sequencer.h @@ -37,6 +37,8 @@ struct replay_opts { int mainline; + const char *gpg_sign; + /* Merge

Re: [PATCH 1/8] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
On Sun, 03 Nov 2013, brian m. carlson wrote: On Sun, Nov 03, 2013 at 04:54:17PM +0100, Nicolas Vigier wrote: diff --git a/sequencer.h b/sequencer.h index 1fc22dcabe13..db43e9cf86dc 100644 --- a/sequencer.h +++ b/sequencer.h @@ -37,6 +37,8 @@ struct replay_opts { int mainline;

[PATCH] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org Helped-by: Brian M. Carlson sand...@crustytoothpaste.net --- Documentation/git-cherry-pick.txt | 7 ++- Documentation/git-revert.txt | 6 +- builtin/revert.c | 2 ++ sequencer.c | 11

Re: [PATCH] cherry-pick, revert: add the --gpg-sign option

2013-11-03 Thread brian m. carlson
On Sun, Nov 03, 2013 at 07:46:15PM +0100, Nicolas Vigier wrote: diff --git a/sequencer.c b/sequencer.c index 06e52b4c83ff..2048cd81b3b2 100644 --- a/sequencer.c +++ b/sequencer.c @@ -392,11 +392,18 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, { struct

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

2013-11-03 Thread Torstein Hegge
On Fri, Nov 01, 2013 at 15:52:06 -0700, Junio C Hamano wrote: * th/reflog-annotated-tag (2013-10-28) 1 commit (merged to 'next' on 2013-11-01 at 8b154cc) + reflog: handle lightweight and annotated tags equally git log -g $annotated_tag, when there is no reflog history, should have

[PATCH] am: add the --gpg-sign option

2013-11-03 Thread Nicolas Vigier
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Second version of this patch. In the first version I forgot to save the status of the gpg-sign option so that it is also used with --continue. Documentation/git-am.txt | 6 +- git-am.sh| 11 ++- 2 files

[PATCH] builtin/remote: remove postfixcmp() and use suffixcmp() instead

2013-11-03 Thread Christian Couder
Commit 8cc5b290 (git merge -Xoption, 25 Nov 2009) introduced suffixcmp() with nearly the same implementation as postfixcmp() that already existed since commit 211c8968 (Make git-remote a builtin, 29 Feb 2008). As postfixcmp() has always been static in builtin/remote.c and is used nowhere else, it

[RFC/PATCH] Add interpret-trailers builtin

2013-11-03 Thread Christian Couder
This RFC patch shows the work in progress to implement a new command: git interpret-trailers 1) Rational: This command should help with RFC 822 style headers, called trailers, that are found at the end of commit messages. For a long time, these trailers have become a de facto standard

[ANN] git-arr 0.12

2013-11-03 Thread Alberto Bertogli
Hi! git-arr is a git repository browser that can generate static HTML instead of having to run dynamically. I've just released version 0.12, which includes minor bug fixes and the following new features: - Support for embedded markdown and image files in the blob view (thanks to Vanya

Re: [RFC/PATCH] Add interpret-trailers builtin

2013-11-03 Thread Johan Herland
On Sun, Nov 3, 2013 at 10:17 PM, Christian Couder chrisc...@tuxfamily.org wrote: This RFC patch shows the work in progress to implement a new command: First of all: Thanks for working on this! This looks like a really good start. Plenty of comments below (mostly either to learn myself, or to

Re: git status: minor output format error

2013-11-03 Thread Duy Nguyen
On Mon, Nov 4, 2013 at 12:17 AM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: git version 1.8.3.2 git status in German says (extract) # geändert: kajongg.py # gelöscht:playfield.py as you can see, there is one space too much before playfield.py LANG=C git status is

[PATCH] wt-status: take the alignment burden off translators

2013-11-03 Thread Nguyễn Thái Ngọc Duy
It's not easy for translators to see spaces in these strings have to align, especially when there are no guarantees that these strings are grouped together in .po files. Refactor the code and do the alignment automatically. Let the translator specify how big the alignment is, though, in case some

New order sample

2013-11-03 Thread Shirley Shmight A.
Please open the link: (http://rghost.net/49896901) which is in exe format to view order samples that we want to place with your company. Give me price list for these samples. Regards, Shirley Shmight A. Sales manager -- To unsubscribe from this list: send the line unsubscribe git in the body of

Importing from subversion with full history

2013-11-03 Thread Oded Arbel
I'm trying to import our team's old subversion repository to git, but I'd like to retain the commit history. I tried 'git svn clone' but that only retrieves commits from the last copy onwards. Because the svn setup is really bad, there is no way I can reproduce the stdlayout structure that 'git

Re: git status: minor output format error

2013-11-03 Thread Ralf Thielow
On Mon, Nov 4, 2013 at 2:46 AM, Duy Nguyen pclo...@gmail.com wrote: On Mon, Nov 4, 2013 at 12:17 AM, Wolfgang Rohdewald wolfg...@rohdewald.de wrote: git version 1.8.3.2 git status in German says (extract) # geändert: kajongg.py # gelöscht:playfield.py as you can see,