On Mon, Dec 25, 2017 at 06:44:58PM +0100, René Scharfe wrote:
> Add a function for clearing the commit marks of all in-core commit
> objects. It's similar to clear_object_flags(), but more precise, since
> it leaves the other object types alone. It still has to iterate through
> them, though.
M
On Tue, Jan 09 2018, Junio C. Hamano jotted:
> * ab/wildmatch-tests (2018-01-04) 7 commits
> (merged to 'next' on 2018-01-09 at 09f0b84098)
> + wildmatch test: create & test files on disk in addition to in-memory
> + wildmatch test: perform all tests under all wildmatch() modes
> + wildmatch
On Mon, Dec 25, 2017 at 06:43:37PM +0100, René Scharfe wrote:
> Pass the entries of the commit array directly to clear_commit_marks_1()
> instead of adding them to a commit_list first. The function clears the
> commit and any first parent without allocation; only higher numbered
> parents are add
On Tue, Jan 09, 2018 at 09:29:31AM -0500, Derrick Stolee wrote:
> > > But even still, finding small answers quickly and accurately and punting
> > > to "really far, I didn't bother to compute it" on the big ones would be
> > > an improvement over always punting.
> > Indeed. The longer I think abou
On Tue, Jan 09, 2018 at 02:15:47PM +0100, Johannes Schindelin wrote:
> > I like this direction a lot. I had hoped we could say "100+ commits
> > ahead",
>
> How about "100+ commits apart" instead?
Yeah, that is probably more accurate for the general case.
> > but I don't think we can do so accu
2018-01-10 1:04 GMT+03:00 Junio C Hamano :
> Olga Telezhnaya writes:
>
>> Rename some variables for easier reading.
>> They point not to values, but to arrays.
>
> Once the code is written and people start to build on top, a change
> like this is not worth the code churn, especially because there
Quoting from v1,
These are just a few improvements that I thought would make the
documentation
related to submodules a little better in various way such as readability,
consistency etc., These were things I noticed while reading thise documents.
Change since v2:
I've squashed the
While at it, correctly quote important words.
Signed-off-by: Kaartic Sivaraam
---
Documentation/git-submodule.txt | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index ff612001d..801d291ca 100644
-
* Only mention porcelain commands in examples
* Split a sentence for better readability
* Add missing apostrophes
* Clearly specify the advantages of using submodules
* Avoid abbreviations
* Use "Git" consistently
* Improve readability of certain lines
* Clarify when a submodule is considere
Dmitry Torokhov writes:
>> I had prepare-commit-msg hook that would scrub "Patchwork-ID: " tags
>> form commit messages and would update input mailing list patchwork to
>> mark corresponding patches as "accepted" when I cherry pick form
>> WIP/review queue into branches that I publish, but th
Hi Junio,
On Fri, Jan 5, 2018 at 10:48 AM, Dmitry Torokhov
wrote:
> Hi,
>
> I had prepare-commit-msg hook that would scrub "Patchwork-ID: " tags
> form commit messages and would update input mailing list patchwork to
> mark corresponding patches as "accepted" when I cherry pick form
> WIP/rev
On January 9, 2018 6:01 PM, Johannes Sixt wrote:
> Am 09.01.2018 um 19:12 schrieb Randall S. Becker:
> > This patch create a configuration variable PATH_MAX that corresponds
> > with the value in limits.h. The value of PATH_MAX, if supplied, is
> > added to BASIC_CFLAGS and will validate with limit
On Tue, 2 Jan 2018 16:18:28 -0800
Brandon Williams wrote:
> Teach remote-curl the 'connect-half-duplex' command which is used to
> establish a half-duplex connection with servers which support protocol
> version 2. This allows remote-curl to act as a proxy, allowing the git
> client to communic
On Tue, 2 Jan 2018 16:18:22 -0800
Brandon Williams wrote:
> +static enum ack_type process_ack(const char *line, struct object_id *oid)
> +{
> + const char *arg;
> +
> + if (!strcmp(line, "NAK"))
> + return NAK;
> + if (skip_prefix(line, "ACK ", &arg)) {
> + if
Junio C Hamano writes:
> Johannes Schindelin writes:
>
>> diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
>> index f1678851de9..470107248eb 100644
>> --- a/t/t0021/rot13-filter.pl
>> +++ b/t/t0021/rot13-filter.pl
>> @@ -31,7 +31,22 @@
>> #
>>
>> use 5.008;
>> -use lib (split(/
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.
You can find the changes described
Olga Telezhnaya writes:
> +static int is_atom(const char *atom, const char *s, int slen)
> +{
> +...
> +}
> +
> +static void expand_atom_into_fields(const char *atom, int len,
> + struct expand_data *data)
> +{
> +...
> +}
> ...
> -static int is_atom(const char *at
Am 09.01.2018 um 19:12 schrieb Randall S. Becker:
This patch create a configuration variable PATH_MAX that
corresponds with the value in limits.h. The value of PATH_MAX,
if supplied, is added to BASIC_CFLAGS and will validate with
limits.h. PATH_MAX is also added to GIT-BUILD-OPTIONS and is
avail
Stefan Beller writes:
> v4:
> Stefan Beller (4):
> t/lib-submodule-update.sh: clarify test
> t/lib-submodule-update.sh: Fix test ignoring ignored files in
> submodules
> unpack-trees: oneway_merge to update submodules
> submodule: submodule_move_head omits old argument in forced case
Dear Friend,
With due respect to your person and much sincerity of purpose. I have a
business proposal which I will like to handle with you. $35 million USD is
involves. But be rest assured that everything is legal and risk free as I have
concluded all the arrangements and the legal papers that
On 01/09, Jonathan Tan wrote:
> On Tue, 9 Jan 2018 14:16:42 -0800
> Brandon Williams wrote:
>
> > All good documentation changes.
>
> Thanks!
>
> > > > + /*
> > > > +* Function called when a client requests the capability as a
> > > > command.
> > > > +* The command reque
On Tue, 9 Jan 2018 14:16:42 -0800
Brandon Williams wrote:
> All good documentation changes.
Thanks!
> > > + /*
> > > + * Function called when a client requests the capability as a command.
> > > + * The command request will be provided to the function via 'keys', the
> > > + * capabilities r
On Tue, 2 Jan 2018 16:18:15 -0800
Brandon Williams wrote:
> diff --git a/connect.c b/connect.c
> index caa539b75..9badd403f 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -12,9 +12,11 @@
> #include "sha1-array.h"
> #include "transport.h"
> #include "strbuf.h"
> +#include "version.h"
> #incl
On 01/09, Jonathan Tan wrote:
> On Tue, 2 Jan 2018 16:18:13 -0800
> Brandon Williams wrote:
>
> > diff --git a/Documentation/technical/protocol-v2.txt
> > b/Documentation/technical/protocol-v2.txt
> > new file mode 100644
> > index 0..b87ba3816
> > --- /dev/null
> > +++ b/Documentation/
Olga Telezhnaya writes:
> Make valid_atoms as a function parameter,
> there could be another variable further.
> Need that for further reusing of formatting logic in cat-file.c.
>
> Signed-off-by: Olga Telezhnaia
> Mentored-by: Christian Couder
> Mentored by: Jeff King
> ---
> ref-filter.c |
Olga Telezhnaya writes:
> Rename some variables for easier reading.
> They point not to values, but to arrays.
Once the code is written and people start to build on top, a change
like this is not worth the code churn, especially because there are
two equally valid schools of naming convention.
Johannes Schindelin writes:
> diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
> index f1678851de9..470107248eb 100644
> --- a/t/t0021/rot13-filter.pl
> +++ b/t/t0021/rot13-filter.pl
> @@ -31,7 +31,22 @@
> #
>
> use 5.008;
> -use lib (split(/:/, $ENV{GITPERLLIB}));
> +sub gitper
Stefan Beller writes:
> Johannes wrote:
>> I think a better alternative would be to introduce a new abbreviation mode
>> that is *intended* to stop caring about unique abbreviations.
>>
>> In web interfaces, for example, it makes tons of sense to show, say, 8
>> digits in link texts and have the
Dear Friend,
With due respect to your person and much sincerity of purpose. I have a
business proposal which I will like to handle with you. $35 million USD is
involves. But be rest assured that everything is legal and risk free as I have
concluded all the arrangements and the legal papers that
Prathamesh Chavan writes:
> The same mechanism is used even for porting this submodule
> subcommand, as used in the ported subcommands till now.
> The function cmd_deinit in split up after porting into four
> functions: module_deinit(), for_each_listed_submodule(),
> deinit_submodule() and deinit
Prathamesh Chavan writes:
> +static int print_default_remote(int argc, const char **argv, const char
> *prefix)
> +{
> + const char *remote;
> +
> + if (argc != 1)
> + die(_("submodule--helper print-default-remote takes no
> arguments"));
> +
> + remote = get_default_rem
On Tue, 2 Jan 2018 16:18:14 -0800
Brandon Williams wrote:
> + symrefs: In addition to the object pointed by it, show the underlying
> +ref pointed by it when showing a symbolic ref.
> + peel: Show peeled tags.
> + ref-pattern : When specified, only references matching the
> +
Sent from my iPhone
Hi,
Santiago Torres wrote:
>> In contrast, working on hash-function-transition.txt? That
>> seems like it'd easily consume many person-months of work.
>> And that plan only exists post-shatter.io, whereas git-evtag
>> long predates both.
>
> I think this is partly true. A hash transition has bee
On Tue, 2 Jan 2018 16:18:13 -0800
Brandon Williams wrote:
> diff --git a/Documentation/technical/protocol-v2.txt
> b/Documentation/technical/protocol-v2.txt
> new file mode 100644
> index 0..b87ba3816
> --- /dev/null
> +++ b/Documentation/technical/protocol-v2.txt
I'll review the docum
On Tue, Jan 9, 2018 at 12:12 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> And in that light, I'd like to propose a new naming scheme:
>>
>> (a) assume that we "tag" HEAD at the start of the rebase
>> (b) any abbreviation must be given as committish anchored to said ref:
>>
>> pick REBAS
Stefan Beller writes:
> And in that light, I'd like to propose a new naming scheme:
>
> (a) assume that we "tag" HEAD at the start of the rebase
> (b) any abbreviation must be given as committish anchored to said ref:
>
> pick REBASE_HEAD~1 commit subject
> pick REBASE_HEAD~2 distak the gostim
>
On 01/09, Prathamesh Chavan wrote:
> The patches [1] and [2] concerning the porting of submodule
> subcommands: sync and deinit were updated in accoudance with
> the changes made in one of such similar portings made earlier
> for submodule subcommand status[3]. Following are the changes
> made:
Th
On Wednesday 10 January 2018 01:01 AM, Stefan Beller wrote:
The submodule's `$GIT_DIR/config` file would come into play when running
`git push --recurse-submodules=check` in the superproject, as this would
@@ -107,13 +108,13 @@ If the submodule is not yet initialized, then the
>>>
On Tue, Jan 9, 2018 at 5:05 AM, Johannes Schindelin
wrote:
> Hi Peff,
>
> On Tue, 9 Jan 2018, Jeff King wrote:
>
>> On Mon, Jan 08, 2018 at 02:43:00PM +0100, Johannes Schindelin wrote:
>>
>> > Take the interactive rebase for example. It generates todo lists with
>> > abbreviated commit names, for
"Andreas G. Schacker" writes:
> Earlier versions of `git read-tree` required the `--prefix` option value
> to end with a slash. This restriction was eventually lifted without a
> corresponding amendment to the documentation.
>
> Signed-off-by: Andreas G. Schacker
> ---
Thanks. "read-tree --pre
On Wednesday 10 January 2018 12:56 AM, Stefan Beller wrote:
> On Tue, Jan 9, 2018 at 8:06 AM, Kaartic Sivaraam
> wrote:
>> On Tuesday 09 January 2018 12:15 AM, Stefan Beller wrote:
- * The command line for those commands that support taking submodule
specs.
>>>
>>> ++ The command l
>>> The submodule's `$GIT_DIR/config` file would come into play when running
>>> `git push --recurse-submodules=check` in the superproject, as this would
>>> @@ -107,13 +108,13 @@ If the submodule is not yet initialized, then the
>>> configuration
>>> inside the submodule does not exist yet, so
On 1/9/2018 10:17 AM, Ævar Arnfjörð Bjarmason wrote:
This is a pathological case I don't have time to dig into right now:
git branch -D orphan;
git checkout --orphan orphan &&
git reset --hard &&
touch foo &&
git add foo &&
git commit -m"foo" &&
time git merge-
On Wednesday 10 January 2018 12:31 AM, Stefan Beller wrote:
> On Tue, Jan 9, 2018 at 8:01 AM, Kaartic Sivaraam
> wrote:
>> On Tuesday 09 January 2018 12:08 AM, Stefan Beller wrote:
diff --git a/Documentation/gitsubmodules.txt
b/Documentation/gitsubmodules.txt
index cb795c6b6..3f739
On 01/09, Jonathan Tan wrote:
> On Tue, 2 Jan 2018 16:18:03 -0800
> Brandon Williams wrote:
>
> > -int packet_read(int fd, char **src_buf, size_t *src_len,
> > - char *buffer, unsigned size, int options)
> > +enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
>
On Tue, Jan 9, 2018 at 8:06 AM, Kaartic Sivaraam
wrote:
> On Tuesday 09 January 2018 12:15 AM, Stefan Beller wrote:
>>>
>>> - * The command line for those commands that support taking submodule specs.
>>
>> ++ The command line for those commands that support taking submodules
>> as part of their p
On Tue, Jan 9, 2018 at 9:57 AM, Prathamesh Chavan wrote:
> The patches [1] and [2] concerning the porting of submodule
> subcommands: sync and deinit were updated in accoudance with
> the changes made in one of such similar portings made earlier
> for submodule subcommand status[3]. Following are
On 01/09, Jonathan Tan wrote:
> On Tue, 2 Jan 2018 16:18:04 -0800
> Brandon Williams wrote:
>
> > diff --git a/pkt-line.h b/pkt-line.h
> > index 06c468927..c446e886a 100644
> > --- a/pkt-line.h
> > +++ b/pkt-line.h
> > @@ -111,6 +111,63 @@ char *packet_read_line_buf(char **src_buf, size_t
> > *
On 01/09, Jonathan Tan wrote:
> On Tue, 2 Jan 2018 16:18:11 -0800
> Brandon Williams wrote:
>
> > diff --git a/transport.c b/transport.c
> > index 63c3dbab9..2378dcb38 100644
> > --- a/transport.c
> > +++ b/transport.c
> > @@ -118,6 +118,7 @@ struct git_transport_data {
> > struct child_proc
Ævar Arnfjörð Bjarmason writes:
> This is obviously a pathological case, but maybe we should work slightly
> harder on the RHS of and discover that it itself is an orphan commit.
In order to discover a commit is an orphan, you'd need to prove not
just that it does not reach the main part of the
Junio C Hamano writes:
> Johannes Schindelin writes:
>
>> As it seems to be impossible to get the attention of the Git GUI
>> maintainer these "days" (I have opened Pull Requests on October 16th
>> 2016 that have not even been looked at), let's just side-step that
>> contribution path which seem
On 01/09, Jonathan Tan wrote:
> On Tue, 2 Jan 2018 16:18:09 -0800
> Brandon Williams wrote:
>
> > - while ((len = read_remote_ref(in, &src_buf, &src_len, &responded))) {
> > + while (state != EXPECTING_DONE) {
> > + switch (packet_reader_read(&reader)) {
> > + case PACKET
On Tue, Jan 9, 2018 at 8:01 AM, Kaartic Sivaraam
wrote:
> On Tuesday 09 January 2018 12:08 AM, Stefan Beller wrote:
>>> diff --git a/Documentation/gitsubmodules.txt
>>> b/Documentation/gitsubmodules.txt
>>> index cb795c6b6..3f73983d5 100644
>>> --- a/Documentation/gitsubmodules.txt
>>> +++ b/Docu
Johannes Schindelin writes:
> As it seems to be impossible to get the attention of the Git GUI
> maintainer these "days" (I have opened Pull Requests on October 16th
> 2016 that have not even been looked at), let's just side-step that
> contribution path which seems to be dormant.
Good to see th
Lars Schneider writes:
>> On 14 Dec 2017, at 00:00, Junio C Hamano wrote:
>>
>> 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
>> th
Yasushi SHOJI writes:
> The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct
> object to object_id but a debug function show_list(), which is
> ifdef'ed to noop, in bisect.c wasn't.
>
> So fix it.
>
> Signed-off-by: Yasushi SHOJI
> ---
Thanks. That's quite an old breakage ;-)
--
My name is Mrs. Emile Kenold from London. I was diagnosed of lung
cancer which had damaged my liver and my health is no longer
responding to medical treatments.
I have made up my mind to give a charity donation of $11 Million to
you and i pray you will be sincere to use this money for charity
From: Jeff Hostetler
Teach long (normal) status format to respect the --no-ahead-behind
parameter and skip the possibly expensive ahead/behind computation
between the branch and the upstream.
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 2 +-
remote.c | 18
From: Jeff Hostetler
Extend stat_tracking_info() to return +1 when branches are not equal and to
take a new "enum ahead_behind_flags" argument to allow skipping the (possibly
expensive) ahead/behind computation.
This will be used in the next commit to allow "git status" to avoid full
ahead/behin
From: Jeff Hostetler
Teach "git status" and "git commit" to accept "--no-ahead-behind"
and "--ahead-behind" arguments to request quick or full ahead/behind
reporting.
When "--no-ahead-behind" is given, the existing porcelain V2 line
"branch.ab +x -y" is replaced with a new "branch.ab +? -?" line
From: Jeff Hostetler
Teach "git status --short --branch" to respect "--no-ahead-behind"
parameter to skip computing ahead/behind counts for the branch and
its upstream and just report '[different]'.
Signed-off-by: Jeff Hostetler
---
t/t6040-tracking-info.sh | 13 +
wt-status.c
From: Jeff Hostetler
This is version 5 of my patch series to avoid expensive ahead/behind
calculations in status. This version completely removes the config
setting and is just the --[no-]ahead-behind command line argument.
Internally (inside MSFT) we have had further discussions in this
area a
On Tue, Jan 9, 2018 at 9:06 AM, Kaartic Sivaraam
wrote:
> On Tuesday 09 January 2018 12:38 AM, Stefan Beller wrote:
>> On Sat, Jan 6, 2018 at 10:46 AM, Kaartic Sivaraam
>> wrote:
>>
>> While small patches are really appreciated for code (bisect, automated
>> testing, and
>> the general difficulty
Elijah Newren writes:
> Hi,
>
> On Tue, Jan 9, 2018 at 11:19 AM, Junio C Hamano wrote:
>
>> > I haven't come up with an addition to the test suite, but I suspect
>> > this change is conceptually wrong. What if a call to this function
>> > is made during a recursive, inner merge?
>
>
On Tue, 2 Jan 2018 16:18:11 -0800
Brandon Williams wrote:
> diff --git a/transport.c b/transport.c
> index 63c3dbab9..2378dcb38 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -118,6 +118,7 @@ struct git_transport_data {
> struct child_process *conn;
> int fd[2];
> unsigned
Hi,
On Tue, Jan 9, 2018 at 11:19 AM, Junio C Hamano wrote:
> > I haven't come up with an addition to the test suite, but I suspect
> > this change is conceptually wrong. What if a call to this function
> > is made during a recursive, inner merge?
Eek, good catch.
> merge-recursiv
On Tue, 2 Jan 2018 16:18:09 -0800
Brandon Williams wrote:
> - while ((len = read_remote_ref(in, &src_buf, &src_len, &responded))) {
> + while (state != EXPECTING_DONE) {
> + switch (packet_reader_read(&reader)) {
> + case PACKET_READ_EOF:
> + d
On Tue, Jan 9, 2018 at 1:19 PM, Junio C Hamano wrote:
> When merging another branch into ours, if their tree is the same as
> the common ancestor's, we can declare that our tree represents the
> result of three-way merge. In such a case, the recursive merge
> backend incorrectly used to create a
Good Day,
Forgive my indignation if this message comes to you as a surprise and may
offend your personality for contacting you without your prior consent and
writing through this channel.
I came across your name and contact on the course of my personal searching when
i was searching for a fore
Junio C Hamano writes:
> + ...
> + test_tick &&
> + git commit --allow-empty -m "O2" &&
> + O1=$(git rev-parse HEAD) &&
> +
> + git reset --hard $O0 &&
> + test_tick &&
> + git commit --allow-empty -m "O2" &&
> + O2=$(git rev-parse HEAD) &&
Does not affect the validit
Apologies: I'm trying out a new mailer - it did not end well. Git 2.12.3 is
not able to connect to mail email system without throwing Auth fails.
Sadly,
Randall
When merging another branch into ours, if their tree is the same as
the common ancestor's, we can declare that our tree represents the
result of three-way merge. In such a case, the recursive merge
backend incorrectly used to create a commit out of our index, even
when the index has changes.
A re
This patch create a configuration variable PATH_MAX that
corresponds with the value in limits.h. The value of PATH_MAX,
if supplied, is added to BASIC_CFLAGS and will validate with
limits.h. PATH_MAX is also added to GIT-BUILD-OPTIONS and is
available in the git test suite.
This patch also creates
On Tue, 2 Jan 2018 16:18:04 -0800
Brandon Williams wrote:
> diff --git a/pkt-line.h b/pkt-line.h
> index 06c468927..c446e886a 100644
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -111,6 +111,63 @@ char *packet_read_line_buf(char **src_buf, size_t
> *src_len, int *size);
> */
> ssize_t read_pack
> > See Documentation/technical/hash-function-transition.txt
> > for how to do it.
>
> evtag took me a day or two to write initially and doesn't
> impose any requirements on users except a small additional
> bit of software.
I agree that, in nature it shouldn't be difficult, but I also think that
On Tue, 2 Jan 2018 16:18:03 -0800
Brandon Williams wrote:
> -int packet_read(int fd, char **src_buf, size_t *src_len,
> - char *buffer, unsigned size, int options)
> +enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
> size_t *src_len,
> +
The same mechanism is used even for porting this submodule
subcommand, as used in the ported subcommands till now.
The function cmd_deinit in split up after porting into four
functions: module_deinit(), for_each_listed_submodule(),
deinit_submodule() and deinit_submodule_cb().
Mentored-by: Christi
Port the submodule subcommand 'sync' from shell to C using the same
mechanism as that used for porting submodule subcommand 'status'.
Hence, here the function cmd_sync() is ported from shell to C.
This is done by introducing four functions: module_sync(),
sync_submodule(), sync_submodule_cb() and p
The patches [1] and [2] concerning the porting of submodule
subcommands: sync and deinit were updated in accoudance with
the changes made in one of such similar portings made earlier
for submodule subcommand status[3]. Following are the changes
made:
* It was observed that the number of params inc
On Tue, 2 Jan 2018 16:18:02 -0800
Brandon Williams wrote:
> The following patches extend what I sent out as an WIP
> (https://public-inbox.org/git/20171204235823.63299-1-bmw...@google.com/) and
> implement protocol version 2.
Summarizing (for myself) the rationale for protocol version 2:
The e
On Tuesday 09 January 2018 12:38 AM, Stefan Beller wrote:
> On Sat, Jan 6, 2018 at 10:46 AM, Kaartic Sivaraam
> wrote:
>
> While small patches are really appreciated for code (bisect, automated
> testing, and
> the general difficulty to reason about code, as a very small change
> may affect the w
Hi Stolee,
On Tue, 9 Jan 2018, Derrick Stolee wrote:
> On 1/9/2018 8:15 AM, Johannes Schindelin wrote:
> >
> > On Tue, 9 Jan 2018, Jeff King wrote:
> >
> > > But I don't think you can approximate both ahead and behind together
> > > without finding the actual merge base.
> > >
> > > But even stil
On Tuesday 09 January 2018 12:19 AM, Stefan Beller wrote:
> On Sat, Jan 6, 2018 at 10:46 AM, Kaartic Sivaraam
> wrote:
>>
>> - * The command line for those commands that support taking submodule
>> - specifications. Most commands have a boolean flag '--recurse-submodules
>> - whether to recurs
Hi Matwey,
On Tue, 9 Jan 2018, Matwey V. Kornilov wrote:
> 2018-01-09 16:25 GMT+03:00 Johannes Schindelin :
> > Hi Matwey,
> >
> > On Tue, 9 Jan 2018, Matwey V. Kornilov wrote:
> >
> >> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin
> >> :
> >> >
> >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wro
On Tuesday 09 January 2018 12:15 AM, Stefan Beller wrote:
>>
>> - * The command line for those commands that support taking submodule specs.
>
> ++ The command line for those commands that support taking submodules
> as part of their pathspecs[1].
> ++
> ++[1] pathspec is an official term accordin
On Tuesday 09 January 2018 12:08 AM, Stefan Beller wrote:
>> diff --git a/Documentation/gitsubmodules.txt
>> b/Documentation/gitsubmodules.txt
>> index cb795c6b6..3f73983d5 100644
>> --- a/Documentation/gitsubmodules.txt
>> +++ b/Documentation/gitsubmodules.txt
>> @@ -63,6 +63,9 @@ Submodules can
>>content that is not compressed by delta computation between trees.
>> - However you can also use submodules to e.g. hold large binary assets
>> + Therefore you can use submodules to hold large binary assets
>
> If this improves readability by a lot, I'd be all for it. But this
Earlier versions of `git read-tree` required the `--prefix` option value
to end with a slash. This restriction was eventually lifted without a
corresponding amendment to the documentation.
Signed-off-by: Andreas G. Schacker
---
Documentation/git-read-tree.txt | 5 ++---
1 file changed, 2 inserti
This is a pathological case I don't have time to dig into right now:
git branch -D orphan;
git checkout --orphan orphan &&
git reset --hard &&
touch foo &&
git add foo &&
git commit -m"foo" &&
time git merge-base --is-ancestor master orphan
This takes around 5 seconds
On 1/9/2018 9:29 AM, Derrick Stolee wrote:
On 1/9/2018 8:15 AM, Johannes Schindelin wrote:
Hi Peff,
On Tue, 9 Jan 2018, Jeff King wrote:
On Mon, Jan 08, 2018 at 03:04:20PM -0500, Jeff Hostetler wrote:
I was thinking about something similar to the logic we use today
about whether to start
As it seems to be impossible to get the attention of the Git GUI
maintainer these "days" (I have opened Pull Requests on October 16th
2016 that have not even been looked at), let's just side-step that
contribution path which seems to be dormant.
These fixes have been in Git for Windows for various
Previously unstaged files can be staged by clicking on them and then
pressing Ctrl+T. Conveniently, the next unstaged file is selected
automatically so that the unstaged files can be staged by repeatedly
pressing Ctrl+T.
When a user hits Ctrl+T one time too many, though, Git GUI used to throw
this
It is possible to select multiple files in the "Unstaged Changes" and
the "Staged Changes" lists. But when hitting Ctrl+T, surprisingly only
one entry is handled, not all selected ones.
Let's just use the same code path as for the "Stage To Commit" and the
"Unstage From Commit" menu items.
This f
If there is nothing to stage, there is nothing to stage. Let's not try
to, even if the file list contains nothing at all.
This fixes https://github.com/git-for-windows/git/issues/1075
Signed-off-by: Johannes Schindelin
---
git-gui/git-gui.sh | 12 ++--
1 file changed, 10 insertions(+),
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".
The reason for this error was that the hunk header looks like this:
@@ -1 +1,2 @@
but the existin
On 1/9/2018 8:15 AM, Johannes Schindelin wrote:
Hi Peff,
On Tue, 9 Jan 2018, Jeff King wrote:
On Mon, Jan 08, 2018 at 03:04:20PM -0500, Jeff Hostetler wrote:
I was thinking about something similar to the logic we use today
about whether to start reporting progress on other long commands.
Tha
2018-01-09 16:25 GMT+03:00 Johannes Schindelin :
> Hi Matwey,
>
> On Tue, 9 Jan 2018, Matwey V. Kornilov wrote:
>
>> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin :
>> >
>> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote:
>> >
>> >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin
>> >> :
>> >> >
>>
Hi Matwey,
On Tue, 9 Jan 2018, Matwey V. Kornilov wrote:
> 2018-01-08 22:36 GMT+03:00 Johannes Schindelin :
> >
> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote:
> >
> >> 2018-01-08 19:32 GMT+03:00 Johannes Schindelin
> >> :
> >> >
> >> > On Mon, 8 Jan 2018, Matwey V. Kornilov wrote:
> >> >
> >>
Hi Peff,
On Tue, 9 Jan 2018, Jeff King wrote:
> On Mon, Jan 08, 2018 at 03:04:20PM -0500, Jeff Hostetler wrote:
>
> > > I was thinking about something similar to the logic we use today
> > > about whether to start reporting progress on other long commands.
> > > That would mean you could still g
1 - 100 of 126 matches
Mail list logo
