--
This is the second time i am sending you this mail.I, Friedrich Mayrhofer
Donate $ 1,000,000.00 to You, Email Me personally for more details.
Regards.
Friedrich Mayrhofer
On Thu, Nov 17, 2016 at 11:33 PM, Karthik Nayak wrote:
> Hey,
>
> On Fri, Nov 18, 2016 at 12:05 AM, Junio C Hamano wrote:
>> Karthik Nayak writes:
>>
>>> On Tue, Nov 15, 2016 at 11:12 PM, Junio C Hamano wrote:
Jacob Keller writes:
...
I think you are going in the right direction
Tonight I was staging changes with `git add -p` and noticed they got
applied at the *wrong* location.
My guess is that when you stage a hunk it doesn't do a line number
fix-up for earlier unstaged hunks in the file.
Screencast: https://asciinema.org/a/7y9qhr0837a7t96m8w14mupnk
Alternatively, an ex
On Mon, Nov 7, 2016 at 10:38 AM, Duy Nguyen wrote:
> (sorry I got sick in the last few weeks and could not respond to this earlier)
(Yeah, I have also been sick during the last few weeks.)
> On Mon, Nov 7, 2016 at 4:44 AM, Christian Couder
> wrote:
>> Le 6 nov. 2016 09:16, "Junio C Hamano" a é
> On Thu, Nov 17, 2016 at 09:10:22AM -0800, Junio C Hamano wrote:
>
> > People interested may want to try the attached single-liner patch to
> > see how the output from _ALL_ commands that use parse-options API
> > looks when given "-h". It could be that the result may not be too
> > bad.
>
>
On Tue, Nov 15, 2016 at 09:42:57AM -0800, Junio C Hamano wrote:
> >> Hmph. I think I tried David's original under GIT_TEST_LONG and saw
> >> it got stuck; could be the same issue, I guess.
> >
> > It works OK here. I think it is just that the test is really slow (by
> > design).
>
> Yeah, I thin
> -Original Message-
> From: Jeff King [mailto:p...@peff.net]
> Sent: Friday, November 18, 2016 12:02 PM
> To: Junio C Hamano
> Cc: David Turner; git@vger.kernel.org; spea...@spearce.org
> Subject: Re: [PATCH] remote-curl: don't hang when a server dies before any
> output
>
> On Tue, Nov 1
On Fri, Nov 18, 2016 at 05:04:59PM +, David Turner wrote:
> > So I don't feel like we have a good patch for the general case yet,
> > and I'm probably not going to get around to implementing it anytime
> > soon.
>
> I'm confused -- it sounds like your patch actually does work (that is,
> tha
> -Original Message-
> From: Jeff King [mailto:p...@peff.net]
> Sent: Friday, November 18, 2016 12:09 PM
> To: David Turner
> Cc: Junio C Hamano; git@vger.kernel.org; spea...@spearce.org
> Subject: Re: [PATCH] remote-curl: don't hang when a server dies before any
> output
>
> On Fri, Nov
On 11/17, Stefan Beller wrote:
> On Thu, Nov 17, 2016 at 2:42 PM, Stefan Beller wrote:
> >
> > I think I'll just write this functionality in C and optionally expose
> > it via the submodule--helper,
> > such that the user facing git-submodule.sh only has to call that helper.
>
> I think it will r
In the event that a HTTP server closes the connection after giving a
200 but before giving any packets, we don't want to hang forever
waiting for a response that will never come. Instead, we should die
immediately.
One case where this happens is when attempting to fetch a dangling
object by SHA.
Goede dag,
Dit is Lloyd's TSB Bank plc leningen aan te bieden.
Lloyds TSB biedt flexibele en betaalbare leningen voor welk doel u te helpen
uw doelen te bereiken. we lening tegen lage rente van 3%. Hier zijn een aantal
belangrijke kenmerken van de persoonlijke lening aangeboden door Llo
Jacob Keller writes:
to get remotes from /refs/foo/abc/xyz we'd need to do
strip=1,strip=-1, which could be
done but ...
>>>
>>> ... would be unnecessary if this is the only use case:
>>>
strbuf_addf(&fmt,
"%%(if:notequals=remotes)%%(refname:base)%%(then)%s%%(else)%s%%(en
On Fri, Nov 18, 2016 at 9:46 AM, Brandon Williams wrote:
>> +
>> + sub = submodule_from_path(null_sha1, path);
>
> This should probably be checked to see if sub not NULL before
> dereferencing it right?
yeah, will fix.
Jeff King writes:
> So I don't feel like we have a good patch for the general case yet, and
> I'm probably not going to get around to implementing it anytime soon. So
> I'd suggest taking David's original patch (to punt when the response is
> empty) in the meantime.
Yup, we are on the same page;
On Thu, Nov 17, 2016 at 5:35 AM, Heiko Voigt wrote:
> On Tue, Nov 15, 2016 at 03:06:46PM -0800, Stefan Beller wrote:
>> Extend rmdir_or_warn() to remove the directories of those submodules which
>> are scheduled for removal. Also teach verify_clean_submodule() to check
>> that a submodule configur
W dniu 08.11.2016 o 21:11, Karthik Nayak pisze:
> From: Karthik Nayak
>
> Implement %(if:equals=) wherein the if condition is only
> satisfied if the value obtained between the %(if:...) and %(then) atom
> is the same as the given ''.
>
> Similarly, implement (if:notequals=) wherein the if condi
Add two helper functions to submodules.c.
`is_submodule_initialized()` checks if a submodule has been initialized
at a given path and `is_submodule_populated()` check if a submodule
has been checked out at a given path.
Signed-off-by: Brandon Williams
---
submodule.c | 38 +++
This revision of this series should address all of the problems brought up with
v3.
* indent output example in patch 5/6.
* fix ':' in submodule names and add a test to verify.
* cleanup some comments.
* fixed tests to test the case where a submodule isn't at the root of a
repository.
* always p
teach submodules to load a '.gitmodules' file from a commit sha1. This
enables the population of the submodule_cache to be based on the state
of the '.gitmodules' file from a particular commit.
Signed-off-by: Brandon Williams
---
cache.h| 2 ++
config.c | 8
sub
If a submodule was renamed at any point since it's inception then if you
were to try and grep on a commit prior to the submodule being moved, you
wouldn't be able to find a working directory for the submodule since the
path in the past is different from the current path.
This patch teaches grep to
Teach grep to recursively search in submodules when provided with a
object. This allows grep to search a submodule based on the state
of the submodule that is present in a commit of the super project.
When grep is provided with a object, the name of the object is
prefixed to all output. In orde
Add `GREP_SOURCE_SUBMODULE` as a grep_source type and cases for this new
type in the various switch statements in grep.c.
When initializing a grep_source with type `GREP_SOURCE_SUBMODULE` the
identifier can either be NULL (to indicate that the working tree will be
used) or a SHA1 (the REV of the s
Allow grep to recognize submodules and recursively search for patterns in
each submodule. This is done by forking off a process to recursively
call grep on each submodule. The top level --super-prefix option is
used to pass a path to the submodule which can in turn be used to
prepend to output or
David Turner writes:
> In the event that a HTTP server closes the connection after giving a
> 200 but before giving any packets, we don't want to hang forever
> waiting for a response that will never come. Instead, we should die
> immediately.
>
> One case where this happens is when attempting t
2016-11-15 19:26 GMT+01:00 Ralf Thielow :
Finally I've found the time to actually try this out and there
are some problems with it.
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 7cf68f07b..33d7c154f 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -5531,8 +5531
On Fri, Nov 18, 2016 at 11:58 AM, Brandon Williams wrote:
> This revision of this series should address all of the problems brought up
> with
> v3.
>
> * indent output example in patch 5/6.
> * fix ':' in submodule names and add a test to verify.
> * cleanup some comments.
> * fixed tests to test
In the event that a HTTP server closes the connection after giving a
200 but before giving any packets, we don't want to hang forever
waiting for a response that will never come. Instead, we should die
immediately.
One case where this happens is when attempting to fetch a dangling
object by SHA.
David Turner writes:
> In the event that a HTTP server closes the connection after giving a
> 200 but before giving any packets, we don't want to hang forever
> waiting for a response that will never come. Instead, we should die
> immediately.
>
> One case where this happens is when attempting t
W dniu 08.11.2016 o 21:12, Karthik Nayak pisze:
[...]
> Add tests for %(symref) and %(symref:short) while we're here.
That's nice.
>
> Helped-by: Junio C Hamano
> Signed-off-by: Karthik Nayak
> ---
[...]
> +test_expect_success 'Add symbolic ref for the following tests' '
> + git symboli
W dniu 08.11.2016 o 21:12, Karthik Nayak pisze:
> From: Karthik Nayak
>
> Since there are multiple atoms which print refs ('%(refname)',
> '%(symref)', '%(push)', '%upstream'), it makes sense to have a common
Minor typo; it should be: "%(upstream)"
> ground for parsing them. This would allow us
Brandon Williams writes:
> diff --git a/grep.h b/grep.h
> index 5856a23..267534c 100644
> --- a/grep.h
> +++ b/grep.h
> @@ -161,6 +161,7 @@ struct grep_source {
> GREP_SOURCE_SHA1,
> GREP_SOURCE_FILE,
> GREP_SOURCE_BUF,
> + GREP_SOURCE_SUBMODU
Brandon Williams writes:
> +static void compile_submodule_options(const struct grep_opt *opt,
> + const struct pathspec *pathspec,
> + int cached, int untracked,
> + int opt_exclude, int use_inde
W dniu 15.11.2016 o 18:42, Junio C Hamano pisze:
> Jacob Keller writes:
>
>> dirname makes sense. What about implementing a reverse variant of
>> strip, which you could perform stripping of right-most components and
>> instead of stripping by a number, strip "to" a number, ie: keep the
>> left N
Brandon Williams writes:
> @@ -300,6 +311,10 @@ static int grep_sha1(struct grep_opt *opt, const
> unsigned char *sha1,
> if (opt->relative && opt->prefix_length) {
> quote_path_relative(filename + tree_name_len, opt->prefix,
> &pathbuf);
> strbuf_insert(&pathb
Brandon Williams writes:
> +static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
> + int cached)
> {
> int hit = 0;
> int nr;
> + struct strbuf name = STRBUF_INIT;
> + int name_base_len = 0;
> + if (super_prefix) {
> +
Brandon Williams writes:
> @@ -671,12 +707,29 @@ static int grep_tree(struct grep_opt *opt, const struct
> pathspec *pathspec,
> enum interesting match = entry_not_interesting;
> struct name_entry entry;
> int old_baselen = base->len;
> + struct strbuf name = STRBUF_INIT;
>
W dniu 08.11.2016 o 21:12, Karthik Nayak pisze:
> From: Karthik Nayak
>
> Introduce setup_ref_filter_porcelain_msg() so that the messages used in
> the atom %(upstream:track) can be translated if needed. This is needed
> as we port branch.c to use ref-filter's printing API's.
>
> Written-by: Mat
On 11/18, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > @@ -671,12 +707,29 @@ static int grep_tree(struct grep_opt *opt, const
> > struct pathspec *pathspec,
> > enum interesting match = entry_not_interesting;
> > struct name_entry entry;
> > int old_baselen = base->len;
> >
On 11/18, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > diff --git a/grep.h b/grep.h
> > index 5856a23..267534c 100644
> > --- a/grep.h
> > +++ b/grep.h
> > @@ -161,6 +161,7 @@ struct grep_source {
> > GREP_SOURCE_SHA1,
> > GREP_SOURCE_FILE,
> > GREP_S
On 11/18, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > +static int grep_cache(struct grep_opt *opt, const struct pathspec
> > *pathspec,
> > + int cached)
> > {
> > int hit = 0;
> > int nr;
> > + struct strbuf name = STRBUF_INIT;
> > + int name_base_len = 0
From: Jacob Keller
This is based off of jt/use-trailer-api-in-commands so that we can make
use of the public trailer API that will parse a string for trailers.
I use trailers as a way to store extra commit metadata, and would like a
convenient way to obtain the trailers of a commit message easil
From: Jacob Keller
Recent patches have expanded on the trailers.c code and we have the
builtin commant git-interpret-trailers which can be used to add or
modify trailer lines. However, there is no easy way to simply display
the trailers of a commit message. Add support for %bT format modifier
whi
From: Jacob Keller
Add %(trailers) and %(contents:trailers) to display the trailers as
interpreted by trailer_info_get. Update documentation and add a test for
the new feature.
Signed-off-by: Jacob Keller
---
Documentation/git-for-each-ref.txt | 2 ++
ref-filter.c | 22 +
Karthik Nayak writes:
> Thanks, will add it in.
OK, here is a reroll of what I sent earlier in
http://public-inbox.org/git/
but rebased so that it can happen as a preparatory bugfix before
your series.
The bug dates back to the very original implementation of %(HEAD) in
7a48b83219 ("fo
On Tue, Nov 15, 2016 at 4:22 PM, David Turner wrote:
>> msgs[ERROR_NOT_UPTODATE_DIR] =
>> _("Updating the following directories would lose untracked
>> files in it:\n%s");
>> + msgs[ERROR_NOT_UPTODATE_SUBMODULE] =
>> + _("Updating the following submodules would
Jacob Keller writes:
> Git interpret-trailers will not recognize this as a trailer block
> because it doesn't have any standard git tags within it. Would it be ok
> to augment the trailer interpretation to say that if we have over 75%
> trailers in the block that we accept it even if it doesn't h
On Tue, Nov 15, 2016 at 4:25 PM, Brandon Williams wrote:
> On 11/15, Stefan Beller wrote:
>> + int flags =
>> CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
>
> For readability you may want to have spaces between the two flags
done
>
>> + if (o->index_only
>> +
Hi
When giving a custom regex to git diff --word-diff-regex= instead of
using the default --word-diff (which splits words on whitespace), git
slows down very considerably... I don't understand why such a speed
difference?
(this question was asked on stack overflow, but after two month
without ans
On Fri, Nov 18, 2016 at 3:38 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> Git interpret-trailers will not recognize this as a trailer block
>> because it doesn't have any standard git tags within it. Would it be ok
>> to augment the trailer interpretation to say that if we have over 75%
From: Jacob Keller
This is based off of jt/use-trailer-api-in-commands so that we can make
use of the public trailer API that will parse a string for trailers.
I use trailers as a way to store extra commit metadata, and would like a
convenient way to obtain the trailers of a commit message easil
From: Jacob Keller
Add %(trailers) and %(contents:trailers) to display the trailers as
interpreted by trailer_info_get. Update documentation and add a test for
the new feature.
Signed-off-by: Jacob Keller
---
Documentation/git-for-each-ref.txt | 2 ++
ref-filter.c | 22 +
From: Jacob Keller
Recent patches have expanded on the trailers.c code and we have the
builtin commant git-interpret-trailers which can be used to add or
modify trailer lines. However, there is no easy way to simply display
the trailers of a commit message.
Add support for %(trailers) format mod
53 matches
Mail list logo
