This patch broadens the set of commits matched by ":/" pathspecs to
include commits reachable from HEAD but not any named ref. This avoids
surprising behavior when working with a detached HEAD and trying to
refer to a commit that was recently created and only exists within the
detached state.
If m
Hi,
On Tue, Jul 10, 2018 at 10:05 PM Alban Gruin wrote:
>
> Hi,
>
> I published a new blog post:
>
> https://blog.pa1ch.fr/posts/2018/07/10/en/gsoc2018-week-10.html
>
Nice work.
Sorry for late notification, my blog is up too.
https://prertik.github.io/post/week-10
Cheers,
Pratik
Sorry for taking so long to get back to this. Hopefully the following
will be acceptable to everyone.
8< -
Subject: [PATCH v2] sequencer: use configured comment character
Use the configured comment character when generating comments about
branches in a todo list. Failure to honor this conf
Sorry. Forgot to include the git versions I tested with (2.13.1,
2.17.0, 2.18.0)
On Wed, Jul 11, 2018 at 7:50 PM Vitali Lovich wrote:
>
> Typically git rev-parse --show-toplevel prints the folder containing
> the .git folder regardless what subdirectory one is in. One exception
> I have found is
Typically git rev-parse --show-toplevel prints the folder containing
the .git folder regardless what subdirectory one is in. One exception
I have found is that if one is within the context of git rebase --exec
then show-toplevel always just prints the current directory it's
running from.
Repro (s
Hi Alban,
On Tue, 10 Jul 2018, Alban Gruin wrote:
> I published a new blog post:
>
> https://blog.pa1ch.fr/posts/2018/07/10/en/gsoc2018-week-10.html
Very pleasant read, and awesome news about the current state of your
project!
Thanks,
Dscho
Two functions in the code (1) check if the repository is configured for
commit graphs, (2) call prepare_commit_graph(), and (3) check if the
graph exists. Move (1) and (3) into prepare_commit_graph(), reducing
duplication of code.
Signed-off-by: Jonathan Tan
---
commit-graph.c | 28 +
This is on _both_ ds/commit-graph-fsck and sb/object-store-lookup,
following Stolee's suggestion.
(It also seems better to build it this way to me, since both these
branches are going into "next" according to the latest What's Cooking.)
Junio wrote in [1]:
> I've added SQUASH??? patch at the tip
Add a struct repository argument to the functions in commit-graph.h that
read the commit graph. (This commit does not affect functions that write
commit graphs.)
Because the commit graph functions can now read the commit graph of any
repository, the global variable core_commit_graph has been remov
Signed-off-by: Jonathan Tan
---
builtin/commit-graph.c | 2 ++
commit-graph.c | 24 ++--
commit-graph.h | 2 ++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index c7d0db5ab4..0bf0c48657 10064
Instead of storing commit graphs in static variables, store them in
struct object_store. There are no changes to the signatures of existing
functions - they all still only support the_repository, and support for
other instances of struct repository will be added in a subsequent
commit.
Signed-off-
Signed-off-by: Jonathan Tan
---
commit-graph.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/commit-graph.h b/commit-graph.h
index 506cb45fb1..674052bef4 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -5,6 +5,8 @@
#include "repository.h"
#include "string-list.h"
+struct commit;
+
Signed-off-by: Jonathan Tan
---
object-store.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/object-store.h b/object-store.h
index a3db17bbf5..0e13543bab 100644
--- a/object-store.h
+++ b/object-store.h
@@ -2,6 +2,9 @@
#define OBJECT_STORE_H
#include "oidmap.h"
+#include "list.h"
+#i
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> This is consistent with `git commit` which, like `git merge`, supports
> passing the commit message via `-m ` and, unlike `git merge` before
> this patch, via `-F `.
>
> It is useful to allow this for scripted use, or
Eric Sunshine writes:
>> diff --git a/sequencer.c b/sequencer.c
>> @@ -2932,7 +2966,8 @@ static int do_merge(struct commit *commit, const char
>> *arg, int arg_len,
>> - strbuf_addf(&buf, "Merge branch '%.*s'",
>> + strbuf_addf(&buf, "Merge %s '%.*s'",
On Wed, Jul 11, 2018 at 2:24 PM Ævar Arnfjörð Bjarmason
wrote:
>
> I think that's true for the likes of linux.git & git.git, but a lot of
> users of git say work in some corporate setting entirely or mostly in
> the same timezone.
>
> In that case, knowing if some commit whose sole message was "fi
On Windows, if a tool calls SetCurrentDirectory with a lower case drive
letter, the subsequent call to GetCurrentDirectory will return the same
lower case drive letter. If that happens, test-drop-caches will error out as
it does not correctly to handle lower case drive letters.
Signed-off-by: Ben
Eric Sunshine writes:
> The --chain-lint option detects broken &&-chains by forcing the test to
> exit early (as the very first step) with a sentinel value. If that
> sentinel is the test's overall exit code, then the &&-chain is intact;
> if not, then the chain is broken. Unfortunately, this det
> -Original Message-
> From: Junio C Hamano On Behalf Of Junio C Hamano
> Sent: Wednesday, July 11, 2018 4:11 PM
> To: Ben Peart
> Cc: Stefan Beller ; git
> Subject: Re: [PATCH v1] handle lower case drive letters on Windows
>
> Ben Peart writes:
>
> >> -Original Message-
> >>
Junio C Hamano writes:
> * jt/commit-graph-per-object-store (2018-07-09) 6 commits
> ...
> Expecting a reroll, as it breaks 32-bit build.
> cf. https://travis-ci.org/git/git/jobs/402422108
> * ot/ref-filter-object-info (2018-07-09) 4 commits
> ...
> Expecting a reroll, as it breaks compilatio
[ Trying to come up with crazy special cases ]
On Wed, Jul 11, 2018 at 1:49 PM Linus Torvalds
wrote:
>
> But it could be anything else invalid, of course. It could be MAX_INT
> or something like that.
That might be better. A timezone of -1 isn't actually a valid
timezone, but I guess you could c
On Sat, Jul 07 2018, Linus Torvalds wrote:
I really like where this is going in general. Having a "human" format
would be great.
> For really recent dates (same day), use the relative date stamp, while
> for old dates (year doesn't match), don't bother with time and timezone.
> [...]
> Once you
> >> Also, this will conflict with sb/object-store-lookup, won't it? I'm
> >> guessing this is why you didn't touch the "git commit-graph
> >> [write|verify]"code paths.
> > It will conflict because of the change to lookup_commit(), but the only
> > new code I'm writing is in t/helper/test-reposito
Andrei Rybak writes:
> On Wed, 11 Jul 2018 at 22:34, Andrei Rybak wrote:
>>
>> Is -1 an OK initial value for timezone if local_time_tzoffset returns
>> negative values as well? It looks like it doesn't matter for from functional
>>
>
> meant to say: "It looks like it doesn't matter from the func
Jeff Felchner writes:
> Hey all, I assumed this was going to be in 2.18, but I'm still having the
> same issue. What's the plan for release of this?
You assumed wrong ;-) A patch written on June 11th that is already
deep into pre-release freeze, unless it is about fixing a regression
during t
On Wed, Jul 11, 2018 at 1:34 PM Andrei Rybak wrote:
>
> > + int human_tz = -1;
>
> Is -1 an OK initial value for timezone if local_time_tzoffset returns
> negative values as well? It looks like it doesn't matter for from functional
The value was intentionally picked to *not* be a valid timezo
On Wed, 11 Jul 2018 at 22:34, Andrei Rybak wrote:
>
> Is -1 an OK initial value for timezone if local_time_tzoffset returns
> negative values as well? It looks like it doesn't matter for from functional
>
meant to say: "It looks like it doesn't matter from the functional
point of view".
On 2018-07-08 00:02, Linus Torvalds wrote:
> diff --git a/date.c b/date.c
> index 49f943e25..4486c028a 100644
> --- a/date.c
> +++ b/date.c
> @@ -77,22 +77,16 @@ static struct tm *time_to_tm_local(timestamp_t time)
> }
>
> /*
> - * What value of "tz" was in effect back then at "time" in the
> - *
Hey all, I assumed this was going to be in 2.18, but I'm still having the same
issue. What's the plan for release of this?
> On 2018 Jun 11, at 4:46, Phillip Wood wrote:
>
> From: Phillip Wood
>
> recount_edited_hunk() introduced in commit 2b8ea7f3c7 ("add -p:
> calculate offset delta for ed
Ben Peart writes:
>> -Original Message-
>> From: Stefan Beller
>> Sent: Wednesday, July 11, 2018 1:59 PM
>> To: Ben Peart
>> Cc: git ; Junio C Hamano
>> Subject: Re: [PATCH v1] handle lower case drive letters on Windows
>>
>> On Wed, Jul 11, 2018 at 10:54 AM Ben Peart
>> wrote:
>> >
On 7/10/2018 1:31 PM, Jonathan Tan wrote:
+static void test_get_commit_tree_in_graph(const char *gitdir,
+ const char *worktree,
+ const struct object_id *commit_oid)
+{
+ struct repository r;
+ struct c
On 07/07/18 02:32, Jeff King wrote:
[snip]
>> I'm not interested in any savings - it would have to be a pretty
>> wacky repo for there to be much in the way of savings!
>>
>> Simply, I have found (for many different reasons) that, if there
>> is no good reason to execute some code, it is _far_ b
HI SZEDER,
On Wed, Jul 11, 2018 at 3:56 AM, SZEDER Gábor wrote:
> On Wed, Jun 27, 2018 at 8:28 PM SZEDER Gábor wrote:
>>
>> > diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
>> > index 03bf1b8a3b..11546d6e14 100755
>> > --- a/t/t3418-rebase-continue.sh
>> > +++ b/t/t3418-reb
> -Original Message-
> From: Stefan Beller
> Sent: Wednesday, July 11, 2018 1:59 PM
> To: Ben Peart
> Cc: git ; Junio C Hamano
> Subject: Re: [PATCH v1] handle lower case drive letters on Windows
>
> On Wed, Jul 11, 2018 at 10:54 AM Ben Peart
> wrote:
> >
> > Teach test-drop-caches to
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.
The tip of 'next' has been rewound
On Wed, Jul 11, 2018 at 8:38 AM Johannes Schindelin via GitGitGadget
wrote:
> Previously, we introduced the `merge` command for use in todo lists,
> to allow to recreate and modify branch topology.
>
> For ease of implementation, and to make review easier, the initial
> implementation only support
On Wed, Jul 11, 2018 at 10:03 AM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> The _only_ reason we want to keep a previously unmerged entry in the
>> index at stage #0 is so that we don't forget the fact that we have
>> corresponding file in the work tree in order to be able to
Hi Eric,
On Wed, Jul 11, 2018 at 2:21 AM, Eric Sunshine wrote:
> On Tue, Jul 10, 2018 at 10:18:33PM -0700, Elijah Newren wrote:
>> Several "recovery" commands outright fail or do not fully recover
>> when directory-file conflicts are present. This includes:
>> * git read-tree --reset HEAD
>>
On Wed, Jul 11, 2018 at 10:54 AM Ben Peart wrote:
>
> Teach test-drop-caches to handle lower case drive letters on Windows.
As someone not quite familiar with Windows (and using Git there),
is this addressing a user visible issue, or a developer visible issue?
(It looks to me as the latter as it
Teach test-drop-caches to handle lower case drive letters on Windows.
Signed-off-by: Ben Peart
---
Notes:
Base Ref: master
Web-Diff: https://github.com/benpeart/git/commit/55b815ee73
Checkout: git fetch https://github.com/benpeart/git drop-caches-v1 && git
checkout 55b815ee73
t/he
> > Does for_each_ref() iterate over per-worktree refs (like "bisect",
> > perhaps)?
>
> No.
To be clear: it iterates only over the per-worktree refs for the current
worktree. So, if you mark an unreachable commit as "bad" with bisect,
then that commit is reachable (and found by ":/") in the enclo
On Wed, Jul 11, 2018 at 10:35 AM Junio C Hamano wrote:
> To be honest, I am not sure if there still are people who use
> octopus
The latest merge with more than 2 parents in linux.git is
df958569dbaa (Merge branches 'acpi-tables' and 'acpica', 2018-07-05),
although looking through the log of octo
On Wed, Jul 11, 2018 at 7:20 PM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> >> diff --git a/sha1-name.c b/sha1-name.c
> >> index 60d9ef3c7..641ca12f9 100644
> >> --- a/sha1-name.c
> >> +++ b/sha1-name.c
> >> @@ -1650,6 +1650,7 @@ static int get_oid_with_context_1(const char *name,
> >>
"Johannes Schindelin via GitGitGadget"
writes:
> The `--rebase-merges` option of `git rebase` generates todo lists that
> include the merge commits that are to be rebased.
>
> To keep things simpler to review, I decided to support only regular, 2-parent
> merge commits first.
>
> With this patc
On Wed, Jul 11, 2018 at 07:26:19PM +0200, SZEDER Gábor wrote:
> > But it is really "make sure that a failed test here does not prevent us
> > from doing this cleanup". So the original really should have just
> > dropped that comment and added a test_when_finished. Bumping it into a
> > separate te
On Wed, Jul 11, 2018 at 4:57 PM Jeff King wrote:
>
> On Wed, Jul 11, 2018 at 02:56:47PM +0200, SZEDER Gábor wrote:
>
> > +# Requires one argument: the name of a file containing the expected
> > stripped
> > +# access log entries.
> > +check_access_log() {
> > + sort "$1" >"$1".sorted &&
> > +
Duy Nguyen writes:
>> diff --git a/sha1-name.c b/sha1-name.c
>> index 60d9ef3c7..641ca12f9 100644
>> --- a/sha1-name.c
>> +++ b/sha1-name.c
>> @@ -1650,6 +1650,7 @@ static int get_oid_with_context_1(const char *name,
>> struct commit_list *list = NULL;
>>
>>
Jeff King writes:
> So I feel like the right answer here is probably this:
>
> diff --git a/wt-status.c b/wt-status.c
> index d1c05145a4..5fcaa3d0f8 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -2340,7 +2340,16 @@ int has_uncommitted_changes(int ignore_submodules)
> if (ignore_submod
Hi Dscho,
On Fri, Mar 9, 2018 at 8:36 AM, Johannes Schindelin via GitGitGadget
wrote:
> From: Johannes Schindelin
>
> Now that we support octopus merges in the `--rebase-merges` mode,
> we should give users who actually read the manuals a chance to know
> about this fact.
>
> Signed-off-by: Joha
Elijah Newren writes:
> The _only_ reason we want to keep a previously unmerged entry in the
> index at stage #0 is so that we don't forget the fact that we have
> corresponding file in the work tree in order to be able to remove it
> when the tree we are resetting to does not hav
On Wed, Jul 11, 2018 at 05:45:09PM +0200, Duy Nguyen wrote:
> > diff --git a/sha1-name.c b/sha1-name.c
> > index 60d9ef3c7..641ca12f9 100644
> > --- a/sha1-name.c
> > +++ b/sha1-name.c
> > @@ -1650,6 +1650,7 @@ static int get_oid_with_context_1(const char *name,
> > struct
On Wed, Jul 11, 2018 at 06:15:05PM +0200, Henning Schild wrote:
> > diff --git a/gpg-interface.c b/gpg-interface.c
> > index bf8d567a4c..139b0f561e 100644
> > --- a/gpg-interface.c
> > +++ b/gpg-interface.c
> > @@ -97,7 +97,7 @@ static void parse_gpg_output(struct signature_check
> > *sigc) sigc->
Am Wed, 11 Jul 2018 10:33:52 -0400
schrieb Jeff King :
> On Tue, Jul 10, 2018 at 10:52:31AM +0200, Henning Schild wrote:
>
> > diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> > index a5d3b2cba..9dcb4e990 100755
> > --- a/t/lib-gpg.sh
> > +++ b/t/lib-gpg.sh
> > @@ -38,7 +38,14 @@ then
> >
Duy Nguyen writes:
> On Tue, Jul 10, 2018 at 9:22 PM Max Kirillov wrote:
>>
>> On Sat, Jun 16, 2018 at 07:14:44AM +0200, Duy Nguyen wrote:
>> > -- 8< --
>> > diff --git a/unpack-trees.c b/unpack-trees.c
>> > index 3a85a02a77..eb544ee1b3 100644
>> > --- a/unpack-trees.c
>> > +++ b/unpack-trees.c
Jeff King writes:
> On Tue, Jul 10, 2018 at 11:18:22PM -0700, William Chargin wrote:
>
>> > Also, I am not sure if "or from HEAD" is even needed when we say
>> > "from ANY ref" already, as we count things like HEAD as part of the
>> > ref namespace.
>>
>> My two cents: with the docs as is, I was
Jeff King writes:
>> While addressing 1 make 2 obvious and worse, addressing 2 is a whole
>> different story and should probably be discussed outside of this
>> thread. And i would not like to inherit responsibility for 2. In
>> fact the whole discussion emphasizes that it was a good idea to make
Am Wed, 11 Jul 2018 10:27:52 -0400
schrieb Jeff King :
> On Wed, Jul 11, 2018 at 03:46:19PM +0200, Henning Schild wrote:
>
> > > I think it's worth addressing in the near term, if only because
> > > this kind of off-by-one is quite subtle, and I don't want to
> > > forget to deal with it. Whether
Johannes Schindelin writes:
> To summarize, there are two commits recorded for that Message-Id, the
> later one not mapped back, and neither is the correct commit that made it
> into `master`.
>
> It would be nice to figure out what went wrong there, and how to fix it
> for the future (and also t
On Wed, Jul 11, 2018 at 1:02 PM Ævar Arnfjörð Bjarmason
wrote:
>
> This segfaults, but should print an error instead, have a repo with a
> corrupt HEAD:
>
> (
> rm -rf /tmp/git &&
> git clone --single-branch --branch todo g...@github.com:git/git.git
> /tmp/git &&
> ech
Am Wed, 11 Jul 2018 10:35:54 -0400
schrieb Jeff King :
> On Wed, Jul 11, 2018 at 03:40:19PM +0200, Henning Schild wrote:
>
> > > So it may be simplest to just run most of the tests twice, once
> > > with gpg and once with gpgsm. I kind of wonder if all of t7510
> > > could just be bumped into a f
On Tue, Jul 10, 2018 at 5:44 PM William Chargin wrote:
>
> This patch broadens the set of commits matched by ":/" pathspecs to
> include commits reachable from HEAD but not any named ref. This avoids
> surprising behavior when working with a detached HEAD and trying to
> refer to a commit that was
Beat Bolli writes:
> Should we add a "pedantic" flag to DEVOPTS that would simplify
> building pedantically? It would also have to set
> USE_PARENS_AROUND_GETTEXT_N so as to not overwhelm the developer with
> too much output.
That may be something worth discussing before doing; I'd prefer to
wai
Elijah Newren writes:
> On Mon, Jul 9, 2018 at 1:22 PM, Elijah Newren wrote:
>> On Mon, Jul 9, 2018 at 10:53 AM, Junio C Hamano wrote:
>>> Elijah Newren writes:
>>>
When a merge succeeds, we expect the resulting contents to depend only
upon the trees and blobs of the branches involve
Johannes Schindelin writes:
>> After poking at it a bit more, I've convinced myself that this is the
>> right thing, as options like "--branches" which expand into multiple
>> tips already push us into the other code path.
>>
>> So here's a re-roll. The first one is identical except for the typo
"brian m. carlson" writes:
> On Tue, Jul 10, 2018 at 02:08:28PM -0400, Ben Peart wrote:
>>
>>
>> On 7/9/2018 7:39 PM, brian m. carlson wrote:
>> > On Mon, Jul 09, 2018 at 10:45:33AM -0700, Junio C Hamano wrote:
>> > > As Brandon alludes to downthread, we probably should use strbuf for
>> > > th
On Mon, Jul 9, 2018 at 11:10 PM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> > On Sun, Jul 8, 2018 at 1:16 AM Kim Gybels wrote:
> >> Should I post a v3 that goes back to the original fix, but uses
> >> test_i18ngrep instead of grep?
> >
> > Yes please. In my comment I did write we didn't nee
On Tue, Jul 10, 2018 at 9:22 PM Max Kirillov wrote:
>
> On Sat, Jun 16, 2018 at 07:14:44AM +0200, Duy Nguyen wrote:
> > -- 8< --
> > diff --git a/unpack-trees.c b/unpack-trees.c
> > index 3a85a02a77..eb544ee1b3 100644
> > --- a/unpack-trees.c
> > +++ b/unpack-trees.c
> > @@ -1246,7 +1246,7 @@ stat
On Wed, Jul 11, 2018 at 04:41:02PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > [From upthread]: It took me a minute to reproduce this. It needs "pull
> > --rebase" if you don't have that setup in your config.
>
> Yeah, sorry about that. I tested without --rebase while simplifying the
> testcase, bu
On Wed, Jul 11, 2018 at 02:56:44PM +0200, SZEDER Gábor wrote:
> 't5561-http-backend.sh' is prone to occasional failures; luckily it's
> not 'git-http-backend's fault, but the test script is a bit racy. I
> won't go into the details here, patch 3/3's commit message discusses
> it at length.
>
> v
On Wed, Jul 11, 2018 at 02:56:47PM +0200, SZEDER Gábor wrote:
> +# Requires one argument: the name of a file containing the expected stripped
> +# access log entries.
> +check_access_log() {
> + sort "$1" >"$1".sorted &&
> + strip_access_log >access.log.stripped &&
> + sort access.log.
On Wed, Jul 11, 2018 at 02:53:23PM +0200, SZEDER Gábor wrote:
> > I.e., could we have a situation where we make a request, the client
> > finishes, and then we look at the logs, but nothing has been written by
> > apache yet?
>
> That's possible, I suppose. Highly improbable, but possible. Or t
On Wed, Jul 11 2018, Jeff King wrote:
> On Wed, Jul 11, 2018 at 09:34:02AM -0400, Jeff King wrote:
>
>> I do worry that other callers of run_diff_index() might have similar
>> problems, though. Grepping around, the other callers seem to fall into
>> one of three categories:
>>
>> - they resolve
On Wed, Jul 11, 2018 at 03:40:19PM +0200, Henning Schild wrote:
> > So it may be simplest to just run most of the tests twice, once with
> > gpg and once with gpgsm. I kind of wonder if all of t7510 could just
> > be bumped into a function. Or even into a sourced file and run from
> > two differen
On Tue, Jul 10, 2018 at 10:52:31AM +0200, Henning Schild wrote:
> diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> index a5d3b2cba..9dcb4e990 100755
> --- a/t/lib-gpg.sh
> +++ b/t/lib-gpg.sh
> @@ -38,7 +38,14 @@ then
> "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
> gpg --h
On Wed, Jul 11, 2018 at 03:46:19PM +0200, Henning Schild wrote:
> > I think it's worth addressing in the near term, if only because this
> > kind of off-by-one is quite subtle, and I don't want to forget to deal
> > with it. Whether that happens as part of this patch, or as a cleanup
> > before or
Hi Junio,
Le 11/07/2018 à 00:33, Junio C Hamano a écrit :
> Alban Gruin writes:
>> -complete_action
>> +exec git rebase--helper --complete-action "$shortrevisions"
>> "$onto_name" \
>> +"$shortonto" "$orig_head" "$cmd" $allow_empty_message \
>> +${autosquash:+--au
On Wed, Jul 11, 2018 at 09:34:02AM -0400, Jeff King wrote:
> I do worry that other callers of run_diff_index() might have similar
> problems, though. Grepping around, the other callers seem to fall into
> one of three categories:
>
> - they resolve the object themselves and put it in the pending
Am Wed, 11 Jul 2018 08:34:25 -0400
schrieb Jeff King :
> On Wed, Jul 11, 2018 at 10:54:59AM +0200, Henning Schild wrote:
>
> > > In the general case you need:
> > >
> > > found = *next ? next + 1 : next;
> > >
> > > or similar. In this case, you can actually do:
> > >
> > > found = next;
>
Am Wed, 11 Jul 2018 08:51:10 -0400
schrieb Jeff King :
> On Wed, Jul 11, 2018 at 12:38:24PM +0200, Henning Schild wrote:
>
> > > Can we save a dummy generated key and just import it? That's what
> > > we do for the regular gpg case.
> >
> > I will look into storing a binary and leaving notes h
On Wed, Jul 11, 2018 at 01:00:57PM +0200, Ævar Arnfjörð Bjarmason wrote:
> This segfaults, but should print an error instead, have a repo with a
> corrupt HEAD:
>
> (
> rm -rf /tmp/git &&
> git clone --single-branch --branch todo g...@github.com:git/git.git
> /tmp/git &&
>
The last test of 't5561-http-backend.sh', 'server request log matches
test results' may fail occasionally, because the order of entries in
Apache's access log doesn't match the order of requests sent in the
previous tests, although all the right requests are there. I saw it
fail on Travis CI five
The second test of 't5541-http-push-smart.sh', 'no empty path
components' truncates Apache's access log by running
echo >.../access.log
which doesn't leave an empty file behind, like a proper truncation
would, but a file with a lone newline in it. Consequently, a later
test checking the log's
Four tests in three httpd-related test scripts check the contents of
Apache's 'access.log', and they all do so by running 'sed' with the
exact same script consisting of four s/// commands to strip
uninteresting log fields and to vertically align the requested URLs.
Extract this into a common helpe
't5561-http-backend.sh' is prone to occasional failures; luckily it's
not 'git-http-backend's fault, but the test script is a bit racy. I
won't go into the details here, patch 3/3's commit message discusses
it at length.
v1 is here; it haven't been picked up by Junio:
https://public-inbox.org/
On Thu, Jun 14, 2018 at 7:53 PM Jeff King wrote:
>
> On Thu, Jun 14, 2018 at 02:31:07PM +0200, SZEDER Gábor wrote:
>
> > The last test of 't5561-http-backend.sh', 'server request log matches
> > test results' may fail occasionally, because the order of entries in
> > Apache's access log doesn't ma
On Wed, Jul 11, 2018 at 12:38:24PM +0200, Henning Schild wrote:
> > Can we save a dummy generated key and just import it? That's what we
> > do for the regular gpg case.
>
> I will look into storing a binary and leaving notes how it was
> generated, just like regular gpg does. The reason i did no
The `--rebase-merges` option of `git rebase` generates todo lists that include
the merge commits that are to be rebased.
To keep things simpler to review, I decided to support only regular, 2-parent
merge commits first.
With this patch series, support is extended to cover also octopus merges.
From: Johannes Schindelin
This is consistent with `git commit` which, like `git merge`, supports
passing the commit message via `-m ` and, unlike `git merge` before
this patch, via `-F `.
It is useful to allow this for scripted use, or for the upcoming patch
to allow (re-)creating octopus merges
From: Johannes Schindelin
Previously, we introduced the `merge` command for use in todo lists,
to allow to recreate and modify branch topology.
For ease of implementation, and to make review easier, the initial
implementation only supported merge commits with exactly two parents.
This patch add
From: Johannes Schindelin
Now that we support octopus merges in the `--rebase-merges` mode,
we should give users who actually read the manuals a chance to know
about this fact.
Signed-off-by: Johannes Schindelin
---
Documentation/git-rebase.txt | 7 ---
1 file changed, 4 insertions(+), 3 d
On Wed, Jul 11, 2018 at 10:54:59AM +0200, Henning Schild wrote:
> > In the general case you need:
> >
> > found = *next ? next + 1 : next;
> >
> > or similar. In this case, you can actually do:
> >
> > found = next;
> >
> > because we know that it's OK to search over the literal space agai
On Tue, Jul 10, 2018 at 11:18:22PM -0700, William Chargin wrote:
> > Also, I am not sure if "or from HEAD" is even needed when we say
> > "from ANY ref" already, as we count things like HEAD as part of the
> > ref namespace.
>
> My two cents: with the docs as is, I wasn't sure whether HEAD was
>
Congratulation To You Dear Beneficiary.
Glory be to almighty God whom make everything possible to God Answer your
prayer Beneficiary. This is to officially inform you that After the Board of
director’s meeting held in United Nations in conjunction with Federal Ministry
Of Finance Office.
We h
This segfaults, but should print an error instead, have a repo with a
corrupt HEAD:
(
rm -rf /tmp/git &&
git clone --single-branch --branch todo g...@github.com:git/git.git
/tmp/git &&
echo
>/tmp/git/.git/refs/heads/todo &&
On Wed, Jun 27, 2018 at 8:28 PM SZEDER Gábor wrote:
>
> > diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
> > index 03bf1b8a3b..11546d6e14 100755
> > --- a/t/t3418-rebase-continue.sh
> > +++ b/t/t3418-rebase-continue.sh
> > @@ -74,6 +74,38 @@ test_expect_success 'rebase --cont
Am Tue, 10 Jul 2018 14:12:57 -0700
schrieb Junio C Hamano :
> Henning Schild writes:
>
> > Add test cases to cover the new X509/gpgsm support. Most of them
> > resemble existing ones. They just switch the format to x509 and set
> > the signingkey when creating signatures. Validation of signature
Am Tue, 10 Jul 2018 13:09:01 -0400
schrieb Jeff King :
> On Tue, Jul 10, 2018 at 10:52:31AM +0200, Henning Schild wrote:
>
> > diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> > index a5d3b2cba..9dcb4e990 100755
> > --- a/t/lib-gpg.sh
> > +++ b/t/lib-gpg.sh
> > @@ -38,7 +38,14 @@ then
> >
> diff --git a/linear-assignment.c b/linear-assignment.c
> new file mode 100644
> index 0..0b0344b5f
> --- /dev/null
> +++ b/linear-assignment.c
> @@ -0,0 +1,203 @@
> +/*
> + * Based on: Jonker, R., & Volgenant, A. (1987). A shortest augmenting
> path
> + * algorithm for dense and sparse l
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ab641bf5a9..ab895ebb32 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -908,6 +908,10 @@ core.commitGraph::
> Enable git commit graph feature. Allows reading from the
> commit-grap
> When lazy-loading a tree for a commit, it will be important to select
> the tree from a specific struct commit_graph. Create a new method that
> specifies the commit-graph file and use that in
> get_commit_tree_in_graph().
>
> Signed-off-by: Derrick Stolee
> ---
> commit-graph.c | 12 +++
1 - 100 of 110 matches
Mail list logo
