my hacky mutt-specific format-patch workflow

2015-01-13 Thread Jeff King
[retitling in case there is a wider audience] On Tue, Jan 13, 2015 at 02:48:15PM -0800, Stefan Beller wrote: Would you mind to share (parts of) the wrapper script? We could see if that makes sense to incorporate into format-patch as well. Sure, but I'll warn you it's kind of gross and

Re: [PATCH] stash: git stash create and git stash store added to git stash usage synopsys

2015-01-13 Thread Scott Schmit
On Tue, Jan 13, 2015 at 11:54:06PM +0600, Alexander Kuleshov wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- git-stash.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-stash.sh b/git-stash.sh index 6846b18..6e30380 100755 --- a/git-stash.sh

[PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Johannes Sixt
For some unknown reason, the dd on my Windows box segfaults every now and than, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Get rid of four invocations of dd and use test-genrandom instead. The new code does change some

[PATCH] bash completion: allow git stash store options completion

2015-01-13 Thread Alexander Kuleshov
This patch adds bash completion for git stash 'store' subcommand which apperead at bd514cad (stash: introduce 'git stash store', 18 Jun 2013) Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- contrib/completion/git-completion.bash | 5 - 1 file changed, 4 insertions(+), 1

[PATCH] stash: git stash create and git stash store added to git stash usage synopsys

2015-01-13 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- git-stash.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-stash.sh b/git-stash.sh index 6846b18..6e30380 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -9,7 +9,9 @@ USAGE=list [options] or: $dashless

[PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- builtin/log.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index ad3cfd8..4431b50 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1246,6 +1246,10 @@ int cmd_format_patch(int argc, const char

[PATCH] stash clear: allow -v/--verbose to be passed

2015-01-13 Thread Alexander Kuleshov
Added new option -v/--verbose to 'git stash clear' for verbose output. For example: $ git stash clear -v Removed stash@{0}: WIP on stash-clear-verbose: 0ae1f56 Merge branch 'bp/diff-relative-config' into pu Removed stash@{1}: WIP on stash-clear-verbose: 0ae1f56 Merge branch

Re: [PATCH v2] log: teach --invert-grep option

2015-01-13 Thread Junio C Hamano
Christoph Junghans ott...@gentoo.org writes: git log --grep=string shows only commits with messages that match the given string, but sometimes it is useful to be able to show only commits that do *not* have certain messages (e.g. show me ones that are not FIXUP commits). Originally, we had

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: 2015-01-14 0:43 GMT+06:00 Junio C Hamano gits...@pobox.com: Why? As some commands does it when they are executed without arguments, like git config, git blame and etc... For format-patch, I think the current behaviour is more of the lack of

Re: [PATCH] stash clear: allow -v/--verbose to be passed

2015-01-13 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: Added new option -v/--verbose to 'git stash clear' for verbose output. Why? I would sort-of understand if it were git stash clear --confirm that internally runs git stash list and then asks Are you sure (Y/n)? and then finally clears [*1*],

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Alexander Kuleshov
Hello Junio, As some commands does it when they are executed without arguments, like git config, git blame and etc... 2015-01-14 0:43 GMT+06:00 Junio C Hamano gits...@pobox.com: Why? -- _ 0xAX -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Jeff King
On Tue, Jan 13, 2015 at 08:26:31AM -0800, Kyle J. McKay wrote: I have this line in my 2.1.4 test output log: t5540-http-push-webdav.sh .. ok [...] I do not build with NO_EXPAT. This is running the tests on OS X without this patch applied. Is something else

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Junio C Hamano
Why? -- 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] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Johannes Sixt
Am 13.01.2015 um 19:56 schrieb Junio C Hamano: Johannes Sixt j...@kdbg.org writes: The new code does change some properties of the generated files: - They are a bit smaller. - They are not sparse anymore. - They do not compress well anymore. - The smaller of the four files is now a

Re: git svn import failure : write .git/Git_svn_hash_BmjclS: Bad file descriptor

2015-01-13 Thread Eric Wong
Minty mintywal...@gmail.com wrote: § git --version git version 2.2.1 What about git svn --version ? (it'll display the SVN binding version, too) Any advice / pointers would be welcome -- I'd be happy to run any tests I'm reasonably comfortable coding in Perl so happy to poke around where I

Re: How to prevent empty git commit --amend

2015-01-13 Thread Daniel Knittl-Frank
On Tue, Jan 13, 2015 at 9:56 AM, Ivo Anjo ivo.a...@ist.utl.pt wrote: Hello, I sometimes get a bit distracted when making amends. Once or twice per week I do a commit, then realize I added something I shouldn't, or forgot to add a line here or there, and then I do a git commit --amend to fix

How to prevent empty git commit --amend

2015-01-13 Thread Ivo Anjo
Hello, I sometimes get a bit distracted when making amends. Once or twice per week I do a commit, then realize I added something I shouldn't, or forgot to add a line here or there, and then I do a git commit --amend to fix it. The thing is, a lot of times I forget to stage the modifications I

commit --amend --author error

2015-01-13 Thread Gunnar Wagner
I got APGL licensed code from someone else and want to post it on my github (without taking credit for the work) tried git commit --amend --author=Author name, www.website.com but got an error message which said something like original author not found Can it be that the --amen --author only

Re: How to prevent empty git commit --amend

2015-01-13 Thread Michael J Gruber
Ivo Anjo schrieb am 13.01.2015 um 11:22: Hello Daniel, Thanks for your answer! My issue is not with cancelling the amend commit, is that because the amend commit already lists changes to the files I am working on (those changes that already went in the commit I was ammending), I don't

Re: How to prevent empty git commit --amend

2015-01-13 Thread Ivo Anjo
Hello Daniel, Thanks for your answer! My issue is not with cancelling the amend commit, is that because the amend commit already lists changes to the files I am working on (those changes that already went in the commit I was ammending), I don't realize that I forgot to add what I changed. For

Re: commit --amend --author error

2015-01-13 Thread Michael J Gruber
Gunnar Wagner schrieb am 13.01.2015 um 09:15: I got APGL licensed code from someone else and want to post it on my github (without taking credit for the work) tried git commit --amend --author=Author name, www.website.com but got an error message which said something like original author

sporadic git failures on interactive rebase

2015-01-13 Thread Henning Moll
Hi, (git version 2.2.0) I am currently developing/testing a script for a history surgery on a quite big repository (~3 commits). The script always runs against exactly the same copy of a git repository. So things should be reproducable, but sometimes i get failures for the following

Re: git rerere forget isn't working?

2015-01-13 Thread Robert Dailey
On Mon, Jan 12, 2015 at 12:24 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: So I want a way to clear out the whole rerere cache (i.e. every remembered conflict resolution). So I try this command: $ git rerere forget . The forget subcommand is to

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Kyle J. McKay
On Jan 12, 2015, at 18:28, Jeff King wrote: When we fetch a symbolic ref file from the remote, we get the whole string ref: refs/heads/master\n, recognize it by skipping past the ref: , and store the rest. We should chomp the trailing newline. [..] This is a regression in v2.1.0. It was

Re: [PATCH] bash completion: allow git stash store options completion

2015-01-13 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: This patch adds bash completion for git stash 'store' subcommand which apperead at bd514cad (stash: introduce 'git stash store', 18 Jun 2013) Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Hmph. The create and store

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: For some unknown reason, the dd on my Windows box segfaults every now and than, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Get rid of four invocations of dd and use test-genrandom instead.

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Another idea would be to take the first commit which is pointed to by another branch as the first commit in the commit range. Trying to figure out what happened from the topology of the history is certainly attractive proposition, but I suspect that it

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Johannes Sixt
Am 13.01.2015 um 22:47 schrieb Jeff King: On Tue, Jan 13, 2015 at 06:36:27PM +0100, Johannes Sixt wrote: For some unknown reason, the dd on my Windows box segfaults every now and than, but since recently, it does so much more often than it used to, which makes running the test suite

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Jeff King
On Tue, Jan 13, 2015 at 11:33:08PM +0100, Johannes Sixt wrote: BTW, is it the incompressibility where the time is lost or lack of sparseness of the files? How does the timing change with this patch on top? Oh, good call. It's the incompressibility. Which makes perfect sense. Once we copy the

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Stefan Beller
On Tue, Jan 13, 2015 at 2:45 PM, Jeff King p...@peff.net wrote: On Tue, Jan 13, 2015 at 02:28:13PM -0800, Junio C Hamano wrote: On the other hand, I am forked from building on this one done with checkout -t is an explicit mark the user leaves, so it would serve as a better hint to base the

Re: [PATCH v2] standardize usage info string format

2015-01-13 Thread Junio C Hamano
Alex Henrie alexhenri...@gmail.com writes: This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for translators. Changes include: - Placing angle brackets around

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Jeff King
On Mon, Jan 12, 2015 at 09:28:58PM -0500, Jeff King wrote: When we fetch a symbolic ref file from the remote, we get the whole string ref: refs/heads/master\n, recognize it by skipping past the ref: , and store the rest. We should chomp the trailing newline. This bug was introduced in

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Jeff King
On Tue, Jan 13, 2015 at 06:36:27PM +0100, Johannes Sixt wrote: For some unknown reason, the dd on my Windows box segfaults every now and than, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Get rid of four invocations of dd and

Re: [PATCH] t1050-large: replace dd by test-genrandom

2015-01-13 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Jan 13, 2015 at 11:33:08PM +0100, Johannes Sixt wrote: BTW, is it the incompressibility where the time is lost or lack of sparseness of the files? How does the timing change with this patch on top? Oh, good call. It's the incompressibility. Which

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Junio C Hamano
Jeff King p...@peff.net writes: So that is perhaps not asking for the feature (I am already happy with my homegrown wrapper), but is maybe an endorsement of it. :) OK. A patch to add this should be reasonably clean and trivial, I would guess. -- To unsubscribe from this list: send the line

Re: [PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-13 Thread Stefan Beller
On Mon, Jan 12, 2015 at 11:07 AM, Junio C Hamano gits...@pobox.com wrote: yes that's what I was trying to hint at. The hook would just see it is unsolicited instead of not having the state available. OK. That makes sort of sense. So if we: 1) did not apply either patch (i.e. we accept

Re: [PATCH v2] git-prompt: preserve value of $? inside shell prompt

2015-01-13 Thread SZEDER Gábor
Hi, Quoting Tony Finch d...@dotat.at: If you have a prompt which displays the command exit status, __git_ps1 without this change corrupts it, although it has the correct value in the parent shell: ~/src/git (master) 0 $ set | grep ^PS1 PS1='\w$(__git_ps1) $? \$ '

Re: [PATCH] http-push: trim trailing newline from remote symref

2015-01-13 Thread Kyle J. McKay
On Jan 13, 2015, at 11:58, Jeff King wrote: On Tue, Jan 13, 2015 at 08:26:31AM -0800, Kyle J. McKay wrote: I have this line in my 2.1.4 test output log: t5540-http-push-webdav.sh .. ok [...] I do not build with NO_EXPAT. This is running the tests on OS X without