Johannes Sixt wrote:
> Am 19.06.2018 um 03:06 schrieb Jonathan Nieder:
>> Ian Jackson wrote[1]:
>>> git-rebase leaves entries like this in the reflog:
>>>
>>>c15f4d5391 HEAD@{33}: rebase: checkout
>>> c15f4d5391ff07a718431aca68a73e672fe8870e
>>>
>>> It would be nice if there were an option
On 6/19/2018 5:51 PM, Ramsay Jones wrote:
From: Junio C Hamano
Complete the removal of unused 'ewah bitmap' code by removing the now
unused 'rlwit_discharge_empty()' function. Also, the 'ewah_clear()'
function can now be made a file-scope static symbol.
Signed-off-by: Ramsay Jones
---
Hi
> On 06/15, Jonathan Tan wrote:
> >
> > Supporting patterns would mean that we would possibly be able to
> > eliminate the ls-refs step, thus saving at least a RTT. (Originally I
> > thought that supporting patterns would also allow us to tolerate refs
> > being removed during the fetch process,
--
Am Mr.Sare Ouedraogo.i work in one of the prime bank here in Burkina
Faso, i want the bank to transfer the money left by our late customer
is a foreigner from Korea. can you invest this money and also help the
poor' the amount value at $13,300,000.00 (Thirteen Million Three
Hundred
On 06/15, Jonathan Tan wrote:
>
> Supporting patterns would mean that we would possibly be able to
> eliminate the ls-refs step, thus saving at least a RTT. (Originally I
> thought that supporting patterns would also allow us to tolerate refs
> being removed during the fetch process, but I see
On 06/19, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > I also think that we should keep this first implementation of
> > ref-in-want simple and *not* include patterns, even if that's what we
> > may want someday down the road. Adding a new capability in the future
> > for support of
On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote:
> Hi,
>
> Attached is a ``fresh start'' of my series to teach 'git grep --column'.
> Since the last time I sent this, much has changed, notably the semantics
> for deciding which column is the first when given (1) extended
> expressions
On Tue, Jun 19, 2018 at 3:37 PM Jonathan Tan wrote:
>
> > Floating on the mailing list, not cooking yet:
>
> One more is my bitmap one here:
Oh right. Thanks for writing the series!
When writing this I dabbled back and forth whether I only present the series
that are on the critical path to
> Floating on the mailing list, not cooking yet:
One more is my bitmap one here:
https://public-inbox.org/git/cover.1528397984.git.jonathanta...@google.com/
It's not in any branch yet, as far as I can tell, so I've just sent out
an e-mail letting Junio know [1].
[1]
On Tue, Jun 19, 2018 at 11:28 AM Heiko Voigt wrote:
>
> Interesting and nobody complained to the mailinglist?
>
For reference this was sometimes called "Fake Submodules" online.
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
Would it be possible to
There is an ongoing effort to remove global state currently and switch over
to pass around the relevant data structures; for most of it we end up passing
around 'the_repository' as it contains everything there is.
Merged into master:
fcb6df32546 Merge branch 'sb/oid-object-info'
a2cec42213c
From: Junio C Hamano
Complete the removal of unused 'ewah bitmap' code by removing the now
unused 'rlwit_discharge_empty()' function. Also, the 'ewah_clear()'
function can now be made a file-scope static symbol.
Signed-off-by: Ramsay Jones
---
Hi Junio,
Can you please add this to the
On Tue, Jun 19, 2018 at 07:25:15PM +0200, Torsten Bögershausen wrote:
> Hej Max,
>
> t5562 fails here under MacOS:
> "gzip -k" is not portable.
What do you mean with is not portable?
I wrote the patch for gzip[1]. That was in 2013, and is included since version
1.6 IIUC:
$ git tag
On Tue, Jun 19, 2018 at 10:40:16PM +0200, Torsten Bögershausen wrote:
>
>
> On 06/19/2018 08:22 PM, Eric Sunshine wrote:
> > On Tue, Jun 19, 2018 at 2:06 PM Junio C Hamano wrote:
> > > Torsten Bögershausen writes:
> > > > t5562 fails here under MacOS:
> > > > "gzip -k" is not portable.
> >
On Tue, Jun 19, 2018 at 10:40:16PM +0200, Torsten Bögershausen wrote:
>
>
> On 06/19/2018 08:22 PM, Eric Sunshine wrote:
> > On Tue, Jun 19, 2018 at 2:06 PM Junio C Hamano wrote:
> > > Torsten Bögershausen writes:
> > > > t5562 fails here under MacOS:
> > > > "gzip -k" is not portable.
> >
René Scharfe writes:
> So let's see what your example does:
>
>$ git grep --column --not \( --not -e foo --or --not -e bar \) trace.h
>trace.h:13: * #define foo(format, ...) bar(format, __VA_ARGS__)
>$ git grep --column --not \( --not -e bar --or --not -e foo \) trace.h
>
On 06/19/2018 08:22 PM, Eric Sunshine wrote:
On Tue, Jun 19, 2018 at 2:06 PM Junio C Hamano wrote:
Torsten Bögershausen writes:
t5562 fails here under MacOS:
"gzip -k" is not portable.
Very odd. Stock /usr/bin/gzip on my MacOS 10.12.6 _does_ recognize -k,
and the test does pass.
This
Brandon Williams writes:
> I also think that we should keep this first implementation of
> ref-in-want simple and *not* include patterns, even if that's what we
> may want someday down the road. Adding a new capability in the future
> for support of such patterns would be relatively simple and
Am 19.06.2018 um 21:11 schrieb Jeff King:
> On Tue, Jun 19, 2018 at 08:50:16PM +0200, René Scharfe wrote:
>
>> Negation causes the whole non-matching line to match, with --column
>> reporting 1 or nothing in such a case, right? Or I think doing the
>> same when the operator is applied a second
Am 19.06.2018 um 19:44 schrieb Taylor Blau:
> diff --git a/grep.c b/grep.c
> index f3329d82ed..a09935d8c5 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -1257,8 +1257,8 @@ static int match_one_pattern(struct grep_pat *p, char
> *bol, char *eol,
> return hit;
> }
>
> -static int
On Tue, Jun 19, 2018 at 07:00:48PM +, Dyer, Edwin wrote:
> Just curious if there was any additional comment on this potential
> OOB? I may have missed it and if so, apologies for the ask.
The fix is in master, and should be part of the upcoming v2.18. See
commit 9d2e330b17 (ewah_read_mmap:
[snip]
> > in which we have rarely-updated branches that we still want to fetch
> > (e.g. an annotated tag when we fetch refs/tags/* or a Gerrit
> > refs/changes/* branch), having the ref advertisement first means that we
> > can omit them from our "want" or "want-ref" list. But not having them
>
Junio C Hamano wrote:
> Todd Zullinger writes:
>> Or Junio may just squash this onto js/rebase-i-root-fix.
>
> Nah, not for a hotfix on the last couple of days before the final.
> We'd need to build on top, not "squash".
Indeed. I somehow missed that you'd merged and pushed the
changes to
On Tue, Jun 19, 2018 at 08:50:16PM +0200, René Scharfe wrote:
> Negation causes the whole non-matching line to match, with --column
> reporting 1 or nothing in such a case, right? Or I think doing the
> same when the operator is applied a second time is explainable.
Yes to your first question.
Greetings, all:
Just curious if there was any additional comment on this potential OOB? I may
have missed it and if so, apologies for the ask.
Cheers,
Ed
-Original Message-
From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of
Luat Nguyen
Sent: Thursday,
On 6/18/2018 2:41 PM, Brandon Williams wrote:
On 06/17, Duy Nguyen wrote:
On Sun, Jun 17, 2018 at 9:02 AM Elijah Newren wrote:
On Fri, Jun 15, 2018 at 10:41 PM, Nguyễn Thái Ngọc Duy
wrote:
This is the beginning of the end of the_index. The problem with
the_index is it lets library code
On 06/15, Junio C Hamano wrote:
> The story would be different if your request were
>
> git fetch refs/heads/*:refs/remotes/origin/*
>
> in which case, you are not even saying "I want this and that ref";
> you are saying "all refs in refs/heads/* whoever ends up serving me
> happens to
Am 19.06.2018 um 19:48 schrieb Jeff King:
> On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote:
>
>>> The key thing about this iteration is that it doesn't regress
>>> performance, because we always short-circuit where we used to. The other
>>> obvious route is to stop short-circuiting
On Tue, Jun 19, 2018 at 8:45 AM Alban Gruin wrote:
>
> This patch series rewrites the reflog operations from shell to C. This
> is part of the effort to rewrite interactive rebase in C.
This series looks good to me.
Thanks,
Stefan
Am 19.06.2018 um 03:06 schrieb Jonathan Nieder:
Ian Jackson wrote[1]:
git-rebase leaves entries like this in the reflog:
c15f4d5391 HEAD@{33}: rebase: checkout
c15f4d5391ff07a718431aca68a73e672fe8870e
It would be nice if there were an option to control this message.
Particularly, when
On Tue, Jun 19, 2018 at 2:06 PM Junio C Hamano wrote:
> Torsten Bögershausen writes:
> > t5562 fails here under MacOS:
> > "gzip -k" is not portable.
Very odd. Stock /usr/bin/gzip on my MacOS 10.12.6 _does_ recognize -k,
and the test does pass.
> Sigh. Perhaps -c would help. Or do BSD
On Mon, Jun 4, 2018 at 8:09 AM Xiaolong Ye wrote:
>
> When users specify the commit range with 'Z..C' pattern for format-patch, all
> the parents of Z (including Z) would be marked as UNINTERESTING which would
> prevent revision walk in prepare_bases from getting the prerequisite commits,
> thus
Jeff King writes:
> Even if it's a double-inversion? The reason we carry both `col` and
> `icol` is that it allows:
>
> git grep --not --not --not --not -e a
>
> to still say "we found 'a' here". That's a dumb thing to ask for, but it
> is true in the end that we show lines with "a" (and will
Torsten Bögershausen writes:
> Hej Max,
>
> t5562 fails here under MacOS:
> "gzip -k" is not portable.
Sigh. Perhaps -c would help. Or do BSD implementations also lack -c?
t/t5562-http-backend-content-length.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
On Tue, Jun 19, 2018 at 10:58:30AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Although there are interesting cases around inversion. For example:
> >
> > git grep --not \( --not -e a --and --not -e b \)
> >
> > is equivalent to:
> >
> > git grep -e a --or -e b
> >
> > Do people
On Tue, Jun 19, 2018 at 10:58:30AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Although there are interesting cases around inversion. For example:
> >
> > git grep --not \( --not -e a --and --not -e b \)
> >
> > is equivalent to:
> >
> > git grep -e a --or -e b
> >
> > Do people
Jeff King writes:
> Although there are interesting cases around inversion. For example:
>
> git grep --not \( --not -e a --and --not -e b \)
>
> is equivalent to:
>
> git grep -e a --or -e b
>
> Do people care if we actually hunt down the exact column where we
> _didn't_ match "b" in the
Am 19.06.2018 um 19:44 schrieb Taylor Blau:
> On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote:
>> Am 19.06.2018 um 18:35 schrieb Jeff King:
>>> On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote:
>> We could add an optimizer pass to reduce the number of regular
>> expressions
On Tue, Jun 19, 2018 at 01:48:47PM -0400, Jeff King wrote:
> On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote:
> > Disabling that optimization for --column wouldn't be a regression since
> > it's a new option.. Picking a random result (based on the order of
> > evaluation) seems
On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote:
> > The key thing about this iteration is that it doesn't regress
> > performance, because we always short-circuit where we used to. The other
> > obvious route is to stop short-circuiting only when "--column" is in
> > effect, which
On Tue, Jun 19, 2018 at 07:33:39PM +0200, René Scharfe wrote:
> Am 19.06.2018 um 18:35 schrieb Jeff King:
> > On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote:
> >> The notable case that it does _not_ cover is matching the following
> >> line:
> >>
> >>a ... b
> >>
> >> with the
On 06/19/2018 07:35 PM, Eric Sunshine wrote:
On Tue, Jun 19, 2018 at 1:33 PM Torsten Bögershausen wrote:
expecting success:
git repack -ad &&
git rev-list --use-bitmap-index --count --all >expect &&
bitmap=$(ls .git/objects/pack/*.bitmap) &&
test_when_finished "rm -f
On 06/14, Jonathan Tan wrote:
> > @@ -1122,6 +1124,7 @@ static int do_fetch(struct transport *transport,
> > int autotags = (transport->remote->fetch_tags == 1);
> > int retcode = 0;
> > const struct ref *remote_refs;
> > + struct ref *new_remote_refs = NULL;
>
> Above, you use the
On Tue, Jun 19, 2018 at 1:33 PM Torsten Bögershausen wrote:
> expecting success:
> git repack -ad &&
> git rev-list --use-bitmap-index --count --all >expect &&
> bitmap=$(ls .git/objects/pack/*.bitmap) &&
> test_when_finished "rm -f $bitmap" &&
> head -c 512 <$bitmap
Am 19.06.2018 um 18:35 schrieb Jeff King:
> On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote:
>> The notable case that it does _not_ cover is matching the following
>> line:
>>
>>a ... b
>>
>> with the following expression
>>
>>git grep --column -e b --or -e a
>>
>> This will
One test case fails here,
but I am to tired to dig further.
ok 42 - pack reuse respects --incremental
expecting success:
git repack -ad &&
git rev-list --use-bitmap-index --count --all >expect &&
bitmap=$(ls .git/objects/pack/*.bitmap) &&
test_when_finished "rm -f $bitmap" &&
On 06/15, Jonathan Tan wrote:
> (replying to the original since my e-mail is about design)
>
> > This version of ref-in-want is a bit more restrictive than what Jonathan
> > originally proposed (only full ref names are allowed instead of globs
> > and OIDs), but it is meant to accomplish the same
Hej Max,
t5562 fails here under MacOS:
"gzip -k" is not portable.
The following works (there may be better solutions, I didn't dig into
the test code)
diff --git a/t/t5562-http-backend-content-length.sh
b/t/t5562-http-backend-content-length.sh
index 8040d80e04..7befe3885c 100755
---
On Tue, Jun 19, 2018 at 09:49:21AM -0700, Junio C Hamano wrote:
> Taylor Blau writes:
>
> > case GREP_NODE_NOT:
> > - h = !match_expr_eval(x->u.unary, bol, eol, ctx, 0);
> > + /*
> > +* Upon visiting a GREP_NODE_NOT, imatch and match become
> > +*
On Tue, Jun 19, 2018 at 09:46:16AM -0700, Junio C Hamano wrote:
> Taylor Blau writes:
>
> > Attached is a ``fresh start'' of my series to teach 'git grep --column'.
> > Since the last time I sent this, much has changed, notably the semantics
> > for deciding which column is the first when given
Elijah Newren writes:
> [As an aside, I know there are multiple other outstanding emails for
> me to respond to, unrelated to this patch. I'll try to get some time
> in the next day or two to respond. Just responding to this one since
> Junio mentioned picking it up for 2.18.]
Thanks for a
Taylor Blau writes:
> case GREP_NODE_NOT:
> - h = !match_expr_eval(x->u.unary, bol, eol, ctx, 0);
> + /*
> + * Upon visiting a GREP_NODE_NOT, imatch and match become
> + * swapped.
> + */
> + h =
Taylor Blau writes:
> Attached is a ``fresh start'' of my series to teach 'git grep --column'.
> Since the last time I sent this, much has changed, notably the semantics
> for deciding which column is the first when given (1) extended
> expressions and (2) --invert.
> ...
> In the future, I'd
On Tue, Jun 19, 2018 at 02:36:50PM +0200, Christian Halstrick wrote:
> What is not clear to me is how we can make use of the servers initial
> response in order control which credential helper to call and how to
> transport the credentials.
I don't think we'd ever decide _which_ credential
On Mon, Jun 18, 2018 at 06:43:01PM -0500, Taylor Blau wrote:
> Attached is a ``fresh start'' of my series to teach 'git grep --column'.
> Since the last time I sent this, much has changed, notably the semantics
> for deciding which column is the first when given (1) extended
> expressions and (2)
On Tue, Jun 19, 2018 at 12:28:26PM -0400, Jeff King wrote:
> On Mon, Jun 18, 2018 at 06:43:14PM -0500, Taylor Blau wrote:
>
> > static void show_line(struct grep_opt *opt, char *bol, char *eol,
> > - const char *name, unsigned lno, char sign)
> > + const char
Jiang Xin writes:
> Hi Junio,
>
> The following changes since commit fd8cb379022fc6f5c6d71d12d10c9388b9f5841c:
>
> l10n: zh_CN: for git v2.18.0 l10n round 1 to 3 (2018-06-18 00:31:45 +0800)
>
> are available in the Git repository at:
>
> git://github.com/git-l10n/git-po
On Mon, Jun 18, 2018 at 06:43:14PM -0500, Taylor Blau wrote:
> static void show_line(struct grep_opt *opt, char *bol, char *eol,
> - const char *name, unsigned lno, char sign)
> + const char *name, unsigned lno, unsigned cno, char sign)
Here "cno" is
Todd Zullinger writes:
> index e500d7c320..352a52e59d 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit'
> '
> set_fake_editor &&
> FAKE_LINES="reword 1 2"
On Tue, Jun 19, 2018 at 6:09 PM Duy Nguyen wrote:
> On Tue, Jun 19, 2018 at 05:16:17PM +0200, Duy Nguyen wrote:
> > No actually, we could do better. Let me see if I can come up with a
> > patch or something...
>
> OK. What we currently do is, when we search for potential untracked
> paths for
On Tue, Jun 19, 2018 at 05:16:17PM +0200, Duy Nguyen wrote:
> No actually, we could do better. Let me see if I can come up with a
> patch or something...
OK. What we currently do is, when we search for potential untracked
paths for adding to the index, we unconditionally ignore anything
inside
On Tue, Jun 19, 2018 at 5:56 PM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> > On Tue, Jun 19, 2018 at 12:36 PM Heiko Voigt wrote:
> >>
> >> On Mon, Jun 18, 2018 at 11:12:15AM -0700, Brandon Williams wrote:
> >> > On 06/18, Duy Nguyen wrote:
> >> > > This sounds like the submodule specific
On 12 Oct 2017 at 11:48 Thomas Braun wrote:
> On 9 Oct 2017 at 23:59, Stefan Beller wrote:
>> On 9 Oct 2017 at 14:29, Thomas Braun wrote:
>>> I'm currently in the progress of pulling some subprojects in a git
>>> repository of mine into their
>>> own repositories and adding these subprojects back
Xtreak writes:
> Signed-off-by: Karthikeyan Singaravelan
> ---
> Documentation/RelNotes/1.7.11.7.txt | 2 +-
> Documentation/RelNotes/2.17.0.txt | 2 +-
> Documentation/RelNotes/2.18.0.txt | 2 +-
> Documentation/diff-options.txt | 2 +-
> 4 files changed, 4 insertions(+), 4
Todd Zullinger writes:
> With luck, this will save you a few minutes, assuming the
> commit message is reasonable (or can be improved with help
> from Phillip and others). :)
OK.
> Or Junio may just squash this onto js/rebase-i-root-fix.
Nah, not for a hotfix on the last couple of days before
Duy Nguyen writes:
> On Tue, Jun 19, 2018 at 12:36 PM Heiko Voigt wrote:
>>
>> On Mon, Jun 18, 2018 at 11:12:15AM -0700, Brandon Williams wrote:
>> > On 06/18, Duy Nguyen wrote:
>> > > This sounds like the submodule specific code in pathspec.c, which has
>> > > been replaced with something else
This rewrites checkout_onto() from shell to C.
A new command (“checkout-onto”) is added to rebase--helper.c. The shell
version is then stripped.
Signed-off-by: Alban Gruin
---
builtin/rebase--helper.c | 7 ++-
git-rebase--interactive.sh | 25 -
sequencer.c
This rewrites setup_reflog_action() from shell to C. The new version is
called checkout_base_commit().
A new command is added to rebase--helper.c, “checkout-base”, as such as
a new flag, “verbose”, to avoid silencing the output of the checkout
operation called by checkout_base_commit().
The
This adds a new function, run_command_silent_on_success(), to redirect
the stdout and stderr of a command to a strbuf, and then to run that
command. This strbuf is printed only if the command fails. It also takes
a parameter, “verbose”. When true, the command is executed without
redirecting its
This patch series rewrites the reflog operations from shell to C. This
is part of the effort to rewrite interactive rebase in C.
The first commit is dedicated to creating a function to silence a
command, as the sequencer will do in several places with these patches.
This branch is based on
On 6/19/2018 10:59 AM, Duy Nguyen wrote:
On Tue, Jun 19, 2018 at 2:54 PM Derrick Stolee wrote:
On 6/12/2018 11:00 AM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 7:01 PM Derrick Stolee wrote:
diff --git a/midx.c b/midx.c
index 616af66b13..3e55422a21 100644
--- a/midx.c
+++ b/midx.c
@@ -1,9
On 6/19/2018 10:51 AM, Duy Nguyen wrote:
On Tue, Jun 19, 2018 at 1:41 PM Derrick Stolee wrote:
Duy,
Here is the patch that was generated by `make coccicheck`.
Thanks,
-Stolee
-->8--
--- builtin/add.c
Ah right. This is on purpose. I think I mentioned in the commit
message that builtin/ is
On Tue, Jun 19, 2018 at 12:36 PM Heiko Voigt wrote:
>
> On Mon, Jun 18, 2018 at 11:12:15AM -0700, Brandon Williams wrote:
> > On 06/18, Duy Nguyen wrote:
> > > This sounds like the submodule specific code in pathspec.c, which has
> > > been replaced with something else in
On Tue, Jun 19, 2018 at 2:54 PM Derrick Stolee wrote:
>
> On 6/12/2018 11:00 AM, Duy Nguyen wrote:
> > On Thu, Jun 7, 2018 at 7:01 PM Derrick Stolee wrote:
> >> diff --git a/midx.c b/midx.c
> >> index 616af66b13..3e55422a21 100644
> >> --- a/midx.c
> >> +++ b/midx.c
> >> @@ -1,9 +1,62 @@
> >>
On Tue, Jun 19, 2018 at 1:41 PM Derrick Stolee wrote:
>
> Duy,
>
> Here is the patch that was generated by `make coccicheck`.
>
> Thanks,
> -Stolee
>
> -->8--
>
> --- builtin/add.c
Ah right. This is on purpose. I think I mentioned in the commit
message that builtin/ is not touched. Do we run
On Tue, Jun 19, 2018 at 1:48 PM Derrick Stolee wrote:
> Personally,
> I find it difficult to base a patch off of multiple in-progress branches
> and would rather work off of a "known good" point like the tip of master.
You should always base your patches on 'master' (or even 'maint' if
it's bug
On Tue, Jun 19, 2018 at 5:46 AM, Phillip Wood wrote:
> From: Phillip Wood
>
> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
> 2017-02-09), when a commit marked as 'reword' in an interactive rebase
> has conflicts and fails to apply, when the rebase is resumed that
updating some git course material, and i want to add to the config
section at least a small number of example config settings that make
practical sense to add to the system /etc/gitconfig file. that is,
config settings that, even if i don't explain them fully, even novice
git users will
On 6/12/2018 11:00 AM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 7:01 PM Derrick Stolee wrote:
diff --git a/midx.c b/midx.c
index 616af66b13..3e55422a21 100644
--- a/midx.c
+++ b/midx.c
@@ -1,9 +1,62 @@
#include "git-compat-util.h"
#include "cache.h"
#include "dir.h"
+#include
From: Phillip Wood
Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
2017-02-09), when a commit marked as 'reword' in an interactive rebase
has conflicts and fails to apply, when the rebase is resumed that commit
will be squashed into its parent with its commit message
What is not clear to me is how we can make use of the servers initial
response in
order control which credential helper to call and how to transport the
credentials.
Imagine we try to clone over http. The initial request sent to the server
may not contain a "Authorization: ..." header and the
On 6/16/2018 1:41 AM, Nguyễn Thái Ngọc Duy wrote:
This is the beginning of the end of the_index. The problem with
the_index is it lets library code anywhere access it freely. This is
not good because from high level you may not realize that the_index is
being used while you don't want to touch
Duy,
Here is the patch that was generated by `make coccicheck`.
Thanks,
-Stolee
-->8--
--- builtin/add.c
+++ /tmp/cocci-output-206193-4c91ec-add.c
@@ -38,13 +38,13 @@ static void chmod_pathspec(struct pathsp
{
int i;
- for (i = 0; i < active_nr; i++) {
- struct
On 6/16/2018 1:41 AM, Nguyễn Thái Ngọc Duy wrote:
Index compat macros are going to be removed to expose the_index and
then reorganized to use the right index instead of simply the_index
because sometimes we want to use a different index.
This cocci script can help with the first step. It can be
Jonathan Nieder writes ("Re: want option to git-rebase"):
> Ian Jackson wrote[1]:
> > git-rebase leaves entries like this in the reflog:
> >
> > c15f4d5391 HEAD@{33}: rebase: checkout
> > c15f4d5391ff07a718431aca68a73e672fe8870e
...
> GIT_REFLOG_ACTION
> When a ref is updated, reflog
On Mon, Jun 18, 2018 at 11:12:15AM -0700, Brandon Williams wrote:
> On 06/18, Duy Nguyen wrote:
> > This sounds like the submodule specific code in pathspec.c, which has
> > been replaced with something else in bw/pathspec-sans-the-index. If
> > you have time, try a version without those changes
Hi,
On Mon, Jun 18, 2018 at 05:55:44PM +0200, Kevin Daudt wrote:
> On Mon, Jun 18, 2018 at 01:19:19PM +0200, Heiko Voigt wrote:
> > I just discovered that when you have a slash at the end of a nested
> > repository, the files contained in the repository get added instead of
> > the gitlink.
[...]
Hi Johannes
On 18/06/18 22:42, Johannes Schindelin wrote:
>
> Hi Phillip,
>
> On Mon, 18 Jun 2018, Phillip Wood wrote:
>
>> On 17/06/18 20:28, Johannes Schindelin wrote:
>>>
>>> On Sun, 17 Jun 2018, Phillip Wood wrote:
>>>
On 17/06/18 06:37, Elijah Newren wrote:
> Ever since commit
On Tue, Jun 19, 2018 at 4:04 AM Luke Diamand wrote:
> Python3 does not have the dict.has_key() function, so replace all
> such calls with "k in dict". This will still work with python2.6
> and python2.7.
>
> Converted using 2to3 (plus some hand-editing)
>
> Signed-off-by: Luke Diamand
> ---
>
Replace calls to print ... with the function form, print(...), to
allow use with python3 as well as python2.x.
Converted using 2to3 (and some hand-editing).
Signed-off-by: Luke Diamand
---
git-p4.py | 248 +++---
1 file changed, 124
Python3 does not have the dict.has_key() function, so replace all
such calls with "k in dict". This will still work with python2.6
and python2.7.
Converted using 2to3 (plus some hand-editing)
Signed-off-by: Luke Diamand
---
git-p4.py | 78 +++
In Python3, basestring no longer exists, so use this workaround.
Signed-off-by: Luke Diamand
---
git-p4.py | 16
1 file changed, 16 insertions(+)
diff --git a/git-p4.py b/git-p4.py
index 67865d14aa..f127ebce27 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -27,6 +27,22 @@
import
The <> string inequality operator (which doesn't seem to be even
documented) no longer exists in python3. Replace with !=.
This still works with python2.
Signed-off-by: Luke Diamand
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index
This patchset is a first small step towards Python3 support for
git-p4.py.
These are all the nice easy changes which can almost be done
automatically using 2to3.
After these changes, it compiles using Python3, but fails to run.
That's because of the bytes vs string change in Python3. Fixing that
See PEP3127. Works fine with python2 as well.
Signed-off-by: Luke Diamand
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 714e442d7c..b449db1cc9 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1841,7 +1841,7 @@ def applyCommit(self, id):
Backticks around a variable are a deprecated alias for repr().
This has been removed in python3, so just use the string
representation instead, which is equivalent.
Signed-off-by: Luke Diamand
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py
Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
> When testing a reworded root commit, ensure that the squash-onto commit
> which is created and amended is still the root commit.
>
> Suggested-by: Phillip Wood
> Helped-by: Johannes Schindelin
> Signed-off-by: Todd Zullinger
Trusting
Hi Stefan,
On Mon, 18 Jun 2018, Stefan Beller wrote:
> On Mon, Jun 18, 2018 at 6:19 AM Alban Gruin wrote:
> >
> > +int setup_reflog_action(struct replay_opts *opts, const char *commit,
> > + int verbose)
> > +{
> > + const char *action;
> > +
> > + if (commit
99 matches
Mail list logo
