Re: Harmful LESS flags

2014-04-24 Thread Matthieu Moy
Junio C Hamano writes: > I am not opposed to changing the default in the longer term, as long > as we have a solid transition plan to ensure that it won't disrupt > and/or upset existing users too much. I am personally in favor of changing the default to drop the S. Silently hiding stuff from th

Re: [PATCH v3] git tag --contains: avoid stack overflow

2014-04-24 Thread Jeff King
On Thu, Apr 24, 2014 at 02:24:39PM +0200, Stepan Kasal wrote: > From: Jean-Jacques Lafay > > In large repos, the recursion implementation of contains(commit, > commit_list) may result in a stack overflow. Replace the recursion with > a loop to fix it. > > This problem is more apparent on Window

Re: Store refreshed stat info in a separate file?

2014-04-24 Thread Duy Nguyen
On Sat, Apr 19, 2014 at 12:43 AM, Junio C Hamano wrote: > Having said that, I do not think there is a fundamental reason why > the stat data has to live inside the same index file. A separate > file is just fine, as long as you can reliably detect that they went > out of sync for whatever reason

[PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-24 Thread Tolga Ceylan
When applying binary patches a full index is required. format-patch already handles this, but diff-tree needs '--full-index' argument to always output full index. Signed-off-by: Tolga Ceylan --- git-p4.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.p

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
Javier Domingo Cansino wrote: > Felipe's > === > > = The publish tracking branch = > I still have problems getting upstream branches correctly configured > as to have this introduced, anyway, I suppose it's optional, so > nothing to add on that. I did so too, until I patch `git branch -v` to

Re: What is missing from Git v2.0

2014-04-24 Thread Javier Domingo Cansino
Felipe's === = The publish tracking branch = I still have problems getting upstream branches correctly configured as to have this introduced, anyway, I suppose it's optional, so nothing to add on that. By the way, remote branch managing has improved a lot, one of the best things I see for br

Re: [PATCH v7 12/12] cherry-pick: copy notes and run hooks

2014-04-24 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 43631b4..fd085e1 100644 > > --- a/git-rebase--interactive.sh > > +++ b/git-rebase--interactive.sh > > @@ -248,7 +248,7 @@ pick_one () { > > > > test -d "$

Re: [PATCH v7 12/12] cherry-pick: copy notes and run hooks

2014-04-24 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > If no action-name is specified, nothing is done. > > Why? Is it because git-rebase implements its own notes-copy-on-rewrite logic? Yes, and `git rebase` uses `git cherry-pick`. -- Felipe Contreras -- To unsubscribe from this list: send t

Re: [PATCH v7 06/12] builtin: add rewrite helper

2014-04-24 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > So that we can load and store rewrites, as well as other operations on a > > list of rewritten commits. > > Please elaborate. Explain why this code shouldn't go in sequencer.c. Isn't it obvious? Because sequencer.c wouldn't be the only use

Re: [PATCH v7 03/12] revert/cherry-pick: add --quiet option

2014-04-24 Thread Felipe Contreras
Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > @@ -635,9 +637,10 @@ static int do_pick_commit(struct commit *commit, > > struct replay_opts *opts) > > } > > > > if (opts->skip_empty && is_index_unchanged() == 1) { > > - warning(_("skipping %s... %s"), > > -

Re: Harmful LESS flags

2014-04-24 Thread Jonathan Nieder
Hi, David Kastrup wrote: > Jeff King writes: >> There are two questions here: >> >> 1. Can less do a better job of indicating what's in the input when -S >> is in effect? >> >> 2. What should get put into $LESS by default? >> >> I was specifically addressing (1). Your comment does not h

Re: [PATCH v7 12/12] cherry-pick: copy notes and run hooks

2014-04-24 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 43631b4..fd085e1 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -248,7 +248,7 @@ pick_one () { > > test -d "$rewritten" && > pick_one_pre

Re: [PATCH v7 12/12] cherry-pick: copy notes and run hooks

2014-04-24 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > If no action-name is specified, nothing is done. Why? Is it because git-rebase implements its own notes-copy-on-rewrite logic? Otherwise, I agree with the goal of making notes.rewrite. work for cherry-pick. -- To unsubscribe from this list: send the line "unsubscribe git

Re: [PATCH v7 06/12] builtin: add rewrite helper

2014-04-24 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > So that we can load and store rewrites, as well as other operations on a > list of rewritten commits. Please elaborate. Explain why this code shouldn't go in sequencer.c. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord.

Re: [PATCH v7 04/12] revert/cherry-pick: add --skip option

2014-04-24 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > Akin to 'am --skip' and 'rebase --skip'. I don't recall why my original sequencer series didn't include this option. Perhaps Jonathan remembers? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More ma

Re: [PATCH v7 03/12] revert/cherry-pick: add --quiet option

2014-04-24 Thread Ramkumar Ramachandra
Felipe Contreras wrote: > @@ -635,9 +637,10 @@ static int do_pick_commit(struct commit *commit, struct > replay_opts *opts) > } > > if (opts->skip_empty && is_index_unchanged() == 1) { > - warning(_("skipping %s... %s"), > - find_unique_abbrev(co

Re: Harmful LESS flags

2014-04-24 Thread David Kastrup
Jeff King writes: > On Thu, Apr 24, 2014 at 11:48:30PM +0200, David Kastrup wrote: > >> > I really think the right solution here is to teach less to make it more >> > obvious that there is something worth scrolling over to. Here's a very >> > rough patch for less, if you want to see what I'm thin

Re: [PATCH v5 5/9] patch-id: document new behaviour

2014-04-24 Thread Junio C Hamano
"Michael S. Tsirkin" writes: >> > +--unstable:: >> > + Use a non-symmetrical sum of hashes, such that reordering >> >> What is a non-symmetrical sum? > > Non-symmetrical combination function is better? I do not think either is very good X-<. The primary points to convey for "--stable" are:

Re: Harmful LESS flags

2014-04-24 Thread Jeff King
On Thu, Apr 24, 2014 at 11:48:30PM +0200, David Kastrup wrote: > > I really think the right solution here is to teach less to make it more > > obvious that there is something worth scrolling over to. Here's a very > > rough patch for less, if you want to see what I'm thinking of. > > Still useles

Re: Harmful LESS flags

2014-04-24 Thread David Kastrup
Jeff King writes: > On Thu, Apr 24, 2014 at 12:29:21PM -0700, Junio C Hamano wrote: > >> David Kastrup writes: >> >> > Junio C Hamano writes: >> > >> >> Traditionally, because the tool grew in a context of being used in a >> >> project whose participants are at least not malicious, always havi

Re: Harmful LESS flags

2014-04-24 Thread Jeff King
On Thu, Apr 24, 2014 at 02:47:01PM -0700, Junio C Hamano wrote: > And I do agree that the "chopped marker" would be a very sensible > thing to show in the "-S" output; I would have chosen "$" myself for > that to match an existing practice in (setq truncate-lines t) in > Emacs, though. Hmm. I do

Re: Harmful LESS flags

2014-04-24 Thread Junio C Hamano
Jeff King writes: > I would think it's the opposite. Long lines look _horrible_ without > "-S", as they get wrapped at awkward points. Using "-S" means that long > lines don't bug you, unless you really want to scroll over and see the > content. > > I really think the right solution here is to te

Re: [PATCH v5 3/9] tests: new test for orderfile options

2014-04-24 Thread Michael S. Tsirkin
On Thu, Apr 24, 2014 at 11:45:35AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > The test is very basic and can be extended. > > Couldn't find a good existing place to put it, > > so created a new file. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > t/t4056-diff-order

Re: Harmful LESS flags

2014-04-24 Thread Jeff King
On Thu, Apr 24, 2014 at 12:29:21PM -0700, Junio C Hamano wrote: > David Kastrup writes: > > > Junio C Hamano writes: > > > >> Traditionally, because the tool grew in a context of being used in a > >> project whose participants are at least not malicious, always having > >> to be on the lookout

Re: [PATCH v5 4/9] patch-id: make it stable against hunk reordering

2014-04-24 Thread Michael S. Tsirkin
On Thu, Apr 24, 2014 at 10:30:44AM -0700, Jonathan Nieder wrote: > Hi, > > Michael S. Tsirkin wrote: > > > Patch id changes if users > > 1. reorder file diffs that make up a patch > > or > > 2. split a patch up to multiple diffs that touch the same path > > (keeping hunks within a single diff ord

Re: [PATCH v5 5/9] patch-id: document new behaviour

2014-04-24 Thread Michael S. Tsirkin
On Thu, Apr 24, 2014 at 10:33:25AM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > > Documentation/git-patch-id.txt | 23 ++- > > 1 file changed, 18 insertions(+), 5 deletions(-) > > Ah, there's the documentation. Please squash this with the patch that > introd

Re: Harmful LESS flags

2014-04-24 Thread David Kastrup
Junio C Hamano writes: > David Kastrup writes: > >> Junio C Hamano writes: >> >>> Traditionally, because the tool grew in a context of being used in a >>> project whose participants are at least not malicious, always having >>> to be on the lookout for fear of middle-of-line tabs hiding bad >>>

Re: What is missing from Git v2.0

2014-04-24 Thread luc . linux
On Thu, Apr 24, 2014 at 09:41:06AM -0400, Theodore Ts'o wrote: > On Thu, Apr 24, 2014 at 03:23:54AM -0500, Felipe Contreras wrote: > Creating a ~/.gitconfig file if one doesn't already is one I agree > with, and at least on Unix systems, telling them that the config file > lives in ~/.gitconfig, or

[PATCH v6 2/2] commit: add --ignore-submodules[=] parameter

2014-04-24 Thread Ronald Weiss
Allow ignoring submodules (or not) by command line switch, like diff and status do. Git commit honors the 'ignore' setting from .gitmodules or .git/config, but didn't allow to override it from command line. This patch depends on Jens Lehmann's patch "commit -m: commit staged submodules regardless

[PATCH v6 1/2] add: add --ignore-submodules[=] parameter

2014-04-24 Thread Ronald Weiss
Allow ignoring submodules (or not) by command line switch, like diff and status do. This commit is also a prerequisite for the next one in series, which adds the --ignore-submodules switch to git commit. That's why a new argument is added to public function add_files_to_cache(), and its call sites

Re: Harmful LESS flags

2014-04-24 Thread Junio C Hamano
David Kastrup writes: > Junio C Hamano writes: > >> Traditionally, because the tool grew in a context of being used in a >> project whose participants are at least not malicious, always having >> to be on the lookout for fear of middle-of-line tabs hiding bad >> contents near the right edges of

Re: Harmful LESS flags

2014-04-24 Thread David Kastrup
Junio C Hamano writes: > Traditionally, because the tool grew in a context of being used in a > project whose participants are at least not malicious, always having > to be on the lookout for fear of middle-of-line tabs hiding bad > contents near the right edges of lines has never been an issue.

Re: What is missing from Git v2.0

2014-04-24 Thread David Kastrup
Felipe Contreras writes: > Andreas Krey wrote: >> On Wed, 23 Apr 2014 22:35:55 +, Felipe Contreras wrote: >> ... >> > Anyway, if you disagree change one of your frequently used passwords to a >> > chapter of The Lord of the Rings for a day. Let's see if you still think >> > that. >> >> Provi

Re: What is missing from Git v2.0

2014-04-24 Thread David Lang
On Thu, 24 Apr 2014, Felipe Contreras wrote: David Kastrup wrote: Felipe Contreras writes: David Kastrup wrote: The people having to read and understand scripts written in the expectation of default aliases. Which are imaginary. And I prefer them to stay that way since then one does not

Re: What is missing from Git v2.0

2014-04-24 Thread Jeff King
On Thu, Apr 24, 2014 at 01:26:33PM -0500, Felipe Contreras wrote: > Jonathan Nieder wrote: > > Stefan Beller wrote: > > > > > I may have missunderstood. > > > > > > So today you cannot commit if you don't provide an email address > > > (usually the first time you try to commit, git asks to "git c

Re: [PATCH v5 4/9] patch-id: make it stable against hunk reordering

2014-04-24 Thread Junio C Hamano
Jonathan Nieder writes: > Should the internal patch-id computation used by commands like 'git > cherry' (see diff.c::diff_get_patch_id) get the same change? (Not a > rhetorical question --- I don't know what the right choice would be > there.) I thought about it but I did not think of a reason

Re: Harmful LESS flags

2014-04-24 Thread Junio C Hamano
David Kastrup writes: > d...@mailtor.net writes: > >> It would be nice if we could change the flags to either >> >> a) avoid cutting off >> b) indicate something has been cut off (<- I prefer this) >> >> I assume there are more people with a similar workflow who're still >> unaware of this feat

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
Theodore Ts'o wrote: > On Thu, Apr 24, 2014 at 03:23:54AM -0500, Felipe Contreras wrote: > > > > There is evidence for the claim that there won't be those problems. You have > > absolutely no evidence there there will. > > It's clear that you've not been able to produce evidence that can > convin

Re: [PATCH v5 3/9] tests: new test for orderfile options

2014-04-24 Thread Junio C Hamano
"Michael S. Tsirkin" writes: > The test is very basic and can be extended. > Couldn't find a good existing place to put it, > so created a new file. > > Signed-off-by: Michael S. Tsirkin > --- > t/t4056-diff-order.sh | 63 > +++ > 1 file changed,

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
Andreas Krey wrote: > On Wed, 23 Apr 2014 22:35:55 +, Felipe Contreras wrote: > ... > > Anyway, if you disagree change one of your frequently used passwords to a > > chapter of The Lord of the Rings for a day. Let's see if you still think > > that. > > Proving that one extreme isn't the optimu

Re: [SECURITY PATCH] git-prompt.sh: don't put unsanitized branch names in $PS1

2014-04-24 Thread Gábor Szeder
Hi, On Apr 22, 2014 2:53 AM, Junio C Hamano wrote: > > Richard Hansen writes: > > > Both bash and zsh subject the value of PS1 to parameter expansion, > > command substitution, and arithmetic expansion.  Rather than include > > the raw, unescaped branch name in PS1 when running in two- or >

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
David Kastrup wrote: > Felipe Contreras writes: > > David Kastrup wrote: > >> The people having to read and understand scripts written in the > >> expectation of default aliases. > > > > Which are imaginary. > > And I prefer them to stay that way since then one does not need to worry > about them

Re: [PATCH] setup: Fix windows path buffer over-stepping

2014-04-24 Thread Junio C Hamano
Martin Erik Werner writes: > Fix a buffer over-stepping issue triggered by providing an absolute path > that is similar to the work tree path. > > abspath_part_inside_repo() may currently increment the path pointer by > offset_1st_component() + wtlen, which is too much, since > offset_1st_compone

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
Jonathan Nieder wrote: > Stefan Beller wrote: > > > I may have missunderstood. > > > > So today you cannot commit if you don't provide an email address > > (usually the first time you try to commit, git asks to "git config > > --global author.email="), if I remember correctly, so > > there is defi

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
Stefan Beller wrote: > I may have missunderstood. > > So today you cannot commit if you don't provide an email address > (usually the first time you try to commit, git asks to "git config > --global author.email="), if I remember correctly, so > there is definitely a valid (i.e. user approved) ema

Re: [PATCH v5 2/9] test: add test_write_lines helper

2014-04-24 Thread Junio C Hamano
Jonathan Nieder writes: > Michael S. Tsirkin wrote: > >> --- a/t/test-lib-functions.sh >> +++ b/t/test-lib-functions.sh >> @@ -712,6 +712,11 @@ test_ln_s_add () { >> fi >> } >> >> +# This function writes out its parameters, one per line >> +test_write_lines () { >> +printf "%s\n" "$@"

Re: [PATCH 2/2] mergetool: run prompt only if guessed tool

2014-04-24 Thread Junio C Hamano
Junio C Hamano writes: > Perhaps like this? > > I take that your original motivation was to confirm to run a tool on > this particular (as opposed to another) path, but the user can also > take the prompt as to confirm to run this (as opposed to some other) > tool. The latter of which of course

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
tytso@ wrote: > On Thu, Apr 24, 2014 at 05:00:13PM +0200, Stefan Beller wrote: > > > I don't even think we need to query the user to fill out all of the > > > fields. We can prepopulate a lot of the fields (name, e-mail address, > > > etc.) from OS specific defaults that are available on most syst

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-24 Thread Felipe Contreras
Stephen Leake wrote: > Felipe Contreras writes: > > >> >> I have a branch which should always be recompiled on update; > >> >> post-update-branch would be a good place for that. > >> > > >> > And why would pre-update-branch not serve that purpose? > >> > >> Because the code that needs to be comp

Re: [PATCH v4 4/6] patch-id: make it stable against hunk reordering

2014-04-24 Thread Junio C Hamano
"Michael S. Tsirkin" writes: > On Wed, Apr 23, 2014 at 03:05:42PM -0700, Junio C Hamano wrote: > >> After comparing the patches 4-6 and the one that has been in 'next' >> for a few weeks, I tried to like the new one, but I couldn't. > > I'm fine with the one in next too. > I was under the impress

Re: What is missing from Git v2.0

2014-04-24 Thread Jonathan Nieder
Stefan Beller wrote: > I may have missunderstood. > > So today you cannot commit if you don't provide an email address > (usually the first time you try to commit, git asks to "git config > --global author.email="), if I remember correctly, so > there is definitely a valid (i.e. user approved) ema

Re: What is missing from Git v2.0

2014-04-24 Thread Stefan Beller
I may have missunderstood. So today you cannot commit if you don't provide an email address (usually the first time you try to commit, git asks to "git config --global author.email="), if I remember correctly, so there is definitely a valid (i.e. user approved) email address. 2014-04-24 17:47 GMT

Re: [PATCH] git-request-pull: add --stat option

2014-04-24 Thread Junio C Hamano
Jiri Slaby writes: > Which is passed on to git diff. I very need this option instead of > changing the terminal size. > > Signed-off-by: Jiri Slaby > --- Interesting. I wonder if that suggests perhaps the default may be better if it were --stat=80 regardless of your terminal width. Oh, wait.

Re: [PATCH v5 4/9] patch-id: make it stable against hunk reordering

2014-04-24 Thread Jonathan Nieder
Hi, Michael S. Tsirkin wrote: > Patch id changes if users > 1. reorder file diffs that make up a patch > or > 2. split a patch up to multiple diffs that touch the same path > (keeping hunks within a single diff ordered to make patch valid). > > As the result is functionally equivalent, a differen

Re: [PATCH v5 5/9] patch-id: document new behaviour

2014-04-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > Documentation/git-patch-id.txt | 23 ++- > 1 file changed, 18 insertions(+), 5 deletions(-) Ah, there's the documentation. Please squash this with the patch that introduces the new behavior so they can be reviewed together more easily (both now an

GIT, libcurl and GSS-Negotiate

2014-04-24 Thread Ivo Bellin Salarin
Hello, I'm having problems while trying to authenticate against a TFS hosted repository. I experience the same problem in git for windows and in git for linux (both versions are 1.9.2). The problem is described on a [github msysgit/git issue](https://github.com/msysgit/git/issues/171) To shortl

Re: [PATCH v5 3/9] tests: new test for orderfile options

2014-04-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > t/t4056-diff-order.sh | 63 > +++ > 1 file changed, 63 insertions(+) > create mode 100755 t/t4056-diff-order.sh I thought this file already existed since v1.9-rc0~8^2~3 (t4056: add new tests for "git diff -O", 2013-12-

Re: [PATCH v5 2/9] test: add test_write_lines helper

2014-04-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > --- a/t/test-lib-functions.sh > +++ b/t/test-lib-functions.sh > @@ -712,6 +712,11 @@ test_ln_s_add () { > fi > } > > +# This function writes out its parameters, one per line > +test_write_lines () { > + printf "%s\n" "$@"; > +} > + Thanks for fixing this.

Re: What is missing from Git v2.0

2014-04-24 Thread tytso
On Thu, Apr 24, 2014 at 05:00:13PM +0200, Stefan Beller wrote: > > I don't even think we need to query the user to fill out all of the > > fields. We can prepopulate a lot of the fields (name, e-mail address, > > etc.) from OS specific defaults that are available on most systems --- > > specifical

Re: [PATCH 3/3] fetch.c: use a single ref transaction for all ref updates

2014-04-24 Thread Ronnie Sahlberg
Fixed, thanks! On Wed, Apr 23, 2014 at 1:17 PM, Eric Sunshine wrote: > On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote: >> Change store_updated_refs to use a single ref transaction for all refs that >> are updated during the fetch. This makes the fetch more atomic when update >> failures

Re: [PATCH 1/3] fetch.c: clear errno before calling functions that might set it

2014-04-24 Thread Ronnie Sahlberg
Fixed. Thanks. On Wed, Apr 23, 2014 at 1:12 PM, Eric Sunshine wrote: > On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote: >> In s_update_ref there are two calls that when they fail we return an error >> based on the errno value. In particular we want to return a specific error >> if ENOTDIR

Re: [PATCH 2/3] fetch.c: change s_update_ref to use a ref transaction

2014-04-24 Thread Ronnie Sahlberg
Fixed. Thanks. On Wed, Apr 23, 2014 at 1:12 PM, Eric Sunshine wrote: > On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg wrote: >> Change s_update_ref to use a ref transaction for the ref update. >> Signed-off-by: Ronnie Sahlberg >> >> Signed-off-by: Ronnie Sahlberg > > Doubled sign-off. > >> -

Re: What is missing from Git v2.0

2014-04-24 Thread Stefan Beller
> I don't even think we need to query the user to fill out all of the > fields. We can prepopulate a lot of the fields (name, e-mail address, > etc.) from OS specific defaults that are available on most systems --- > specifically, the default values we would use the name and e-mail > address are n

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-24 Thread Stephen Leake
Felipe Contreras writes: >> >> I have a branch which should always be recompiled on update; >> >> post-update-branch would be a good place for that. >> > >> > And why would pre-update-branch not serve that purpose? >> >> Because the code that needs to be compiled is not yet in the workspace > >

Re: What is missing from Git v2.0

2014-04-24 Thread Theodore Ts'o
On Thu, Apr 24, 2014 at 03:23:54AM -0500, Felipe Contreras wrote: > > There is evidence for the claim that there won't be those problems. You have > absolutely no evidence there there will. Felipe, It's clear that you've not been able to produce evidence that can convince most of the people on t

Re: What is missing from Git v2.0

2014-04-24 Thread Andreas Krey
On Wed, 23 Apr 2014 22:35:55 +, Felipe Contreras wrote: ... > Anyway, if you disagree change one of your frequently used passwords to a > chapter of The Lord of the Rings for a day. Let's see if you still think that. Proving that one extreme isn't the optimum doesn't prove the other is. Andre

[PATCH] setup: Fix windows path buffer over-stepping

2014-04-24 Thread Martin Erik Werner
Fix a buffer over-stepping issue triggered by providing an absolute path that is similar to the work tree path. abspath_part_inside_repo() may currently increment the path pointer by offset_1st_component() + wtlen, which is too much, since offset_1st_component() is a subset of wtlen. For the *nix

Re: error: git-remote-https died of signal 13

2014-04-24 Thread Daniel Stenberg
On Thu, 24 Apr 2014, Jeff King wrote: Thanks, that's very helpful. I wasn't able to reproduce your problem locally, but I suspect the curl patch below may fix it: ... Daniel, I think the similar fix to curl_multi_cleanup in commit a900d45 missed this code path, and we need something like the

Re: [PATCH v3] git tag --contains: avoid stack overflow

2014-04-24 Thread Stepan Kasal
From: Jean-Jacques Lafay In large repos, the recursion implementation of contains(commit, commit_list) may result in a stack overflow. Replace the recursion with a loop to fix it. This problem is more apparent on Windows than on Linux, where the stack is more limited by default. See also this t

Re: [PATCH v2] git tag --contains : avoid stack overflow

2014-04-24 Thread Stepan Kasal
Thanks for all suggestions and explanations. The diff against PATCH v2 is below, PATCH v3 follows. Have a nice day, Stepan Subject: [PATCH] fixup! git tag --contains : avoid stack overflow --- t/t7004-tag.sh | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a

Re: error: git-remote-https died of signal 13

2014-04-24 Thread Greg M
On Thu, Apr 24, 2014 at 12:15 AM, Jeff King wrote: > I suspect the curl patch below may fix it: > > diff --git a/lib/multi.c b/lib/multi.c > index bc93264..72e4825 100644 > --- a/lib/multi.c > +++ b/lib/multi.c > @@ -1804,10 +1804,13 @@ static void close_all_connections(struct Curl_multi > *multi

[PATCH v5 3/9] tests: new test for orderfile options

2014-04-24 Thread Michael S. Tsirkin
The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin --- t/t4056-diff-order.sh | 63 +++ 1 file changed, 63 insertions(+) create mode 100755 t/t4056-dif

Re: Git clone gives zero file permissions

2014-04-24 Thread Johannes Sixt
Am 4/24/2014 10:24, schrieb Jussi Peltonen: > I installed git to my Windows 7 workstation and cloned > "http://git.ipxe.org/ipxe.git"; by using the Git GUI. > > ipxe-23042014/src tree looks like this in Cygwin bash: > > Files have no permissions, same goes with subfolders, e.g. > > $ ls -l confi

[PATCH v5 1/9] diff: add a config option to control orderfile

2014-04-24 Thread Michael S. Tsirkin
I always want my diffs to show header files first, then .c files, then the rest. Make it possible to set orderfile though a config option to achieve this. Signed-off-by: Michael S. Tsirkin --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index b79432b..6bcb26b 10

[PATCH v5 7/9] patch-id: change default to stable

2014-04-24 Thread Michael S. Tsirkin
--stable has been the default in 'next' for a few weeks with no ill effects. Change the default to that so that users don't have to remember to enable it. Signed-off-by: Michael S. Tsirkin --- builtin/patch-id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/patc

[PATCH v5 2/9] test: add test_write_lines helper

2014-04-24 Thread Michael S. Tsirkin
API and implementation as suggested by Junio. Signed-off-by: Michael S. Tsirkin --- t/test-lib-functions.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index aeae3ca..0e21275 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-func

[PATCH v5 4/9] patch-id: make it stable against hunk reordering

2014-04-24 Thread Michael S. Tsirkin
Patch id changes if users 1. reorder file diffs that make up a patch or 2. split a patch up to multiple diffs that touch the same path (keeping hunks within a single diff ordered to make patch valid). As the result is functionally equivalent, a different patch id is surprising to many users. In pa

[PATCH v5 6/9] patch-id-test: test stable and unstable behaviour

2014-04-24 Thread Michael S. Tsirkin
Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin --- t/t4204-patch-id.sh | 128 +++- 1 file changed, 117 insertions(+), 11 deletions(-) diff --git a/t/t4204-patch-id.sh

[PATCH v5 5/9] patch-id: document new behaviour

2014-04-24 Thread Michael S. Tsirkin
Clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: Michael S. Tsirkin --- Documentation/git-patch-id.txt | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Docum

[PATCH v5 9/9] Documentation/git-patch-id.txt: default is stable

2014-04-24 Thread Michael S. Tsirkin
Update documentation to match behaviour change. Signed-off-by: Michael S. Tsirkin --- Documentation/git-patch-id.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index e21b79b..9299b90 100644 --- a/Docume

[PATCH v5 8/9] t4204-patch-id.sh: default is now stable

2014-04-24 Thread Michael S. Tsirkin
update test to match behaviour change Signed-off-by: Michael S. Tsirkin --- t/t4204-patch-id.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index cd13e8e..03f91ce 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -

[PATCH] git-request-pull: add --stat option

2014-04-24 Thread Jiri Slaby
Which is passed on to git diff. I very need this option instead of changing the terminal size. Signed-off-by: Jiri Slaby --- git-request-pull.sh | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-request-pull.sh b/git-request-pull.sh index 5c1599752314..a23f03fddec0 1

Re: [PATCH] Unicode: update of combining code points

2014-04-24 Thread Peter Krefting
Torsten Bögershausen: Some of the code points which have "0 length on the display" are called "combining", others are called "vowels" or "accents". E.g. 5BF is not marked any of them, but if you look at the glyph, it should be combining (please correct me if that is wrong). All combining chara

Re: What is missing from Git v2.0

2014-04-24 Thread David Kastrup
Felipe Contreras writes: > David Kastrup wrote: >> Felipe Contreras writes: >> >> > James Denholm wrote: >> >> Felipe Contreras wrote: >> >> >This is a false dichotomy; there aren't just two kinds >> >> > of Git users. >> >> > >> >> > There is such a category of Git users who are not >> >> > fr

Re: [PATCH] git-rebase: fix probable reflog typo

2014-04-24 Thread Matthieu Moy
Felipe Contreras writes: > Recently some code was changed to do 'test_must_fail env VAR=VAL command', why > can't we do the same? I guess we can. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to major

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
David Kastrup wrote: > Felipe Contreras writes: > > > James Denholm wrote: > >> Felipe Contreras wrote: > >> >This is a false dichotomy; there aren't just two kinds > >> > of Git users. > >> > > >> > There is such a category of Git users who are not > >> > fresh-out-of-the-boat, yet not power use

Git clone gives zero file permissions

2014-04-24 Thread Jussi Peltonen
Hello, I installed git to my Windows 7 workstation and cloned "http://git.ipxe.org/ipxe.git"; by using the Git GUI. ipxe-23042014/src tree looks like this in Cygwin bash: d-+ 1 peltoju Domain Users 0 Apr 23 09:00 arch d-+ 1 peltoju Domain Users 0 Apr 23 09:00 bin d---

Re: [PATCH v7 05/12] cherry-pick: remember rerere-autoupdate

2014-04-24 Thread Eric Sunshine
On Wed, Apr 23, 2014 at 10:44 PM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh > index e6a6481..274b2cc 100755 > --- a/t/t3504-cherry-pick-rerere.sh > +++ b/t/t3504-cherry-pick-rerere.sh > @@ -42,4 +42

Re: What is missing from Git v2.0

2014-04-24 Thread David Kastrup
Felipe Contreras writes: > James Denholm wrote: >> Felipe Contreras wrote: >> >This is a false dichotomy; there aren't just two kinds >> > of Git users. >> > >> > There is such a category of Git users who are not >> > fresh-out-of-the-boat, yet not power users either. >> >> Oh, I didn't mean to

Re: [PATCH] git-rebase: fix probable reflog typo

2014-04-24 Thread Felipe Contreras
Matthieu Moy wrote: > Felipe Contreras writes: > > Matthieu Moy wrote: > >> Felipe Contreras writes: > >> > >> > Commit 26cd160 (rebase -i: use a better reflog message) tried to produce > >> > a better reflog message, however, it seems a statement was introduced by > >> > mistake. > >> > > >> >

Re: What is missing from Git v2.0

2014-04-24 Thread Felipe Contreras
James Denholm wrote: > Felipe Contreras wrote: > >This is a false dichotomy; there aren't just two kinds > > of Git users. > > > > There is such a category of Git users who are not > > fresh-out-of-the-boat, yet not power users either. > > Oh, I didn't mean to suggest a dichotomy of any kind. Howe