About the Notifications timeline.pdf
Description: Adobe PDF document
gabriel...@gmail.com
Hi, everyone
I've been posting about the progress of my GSoC project at
https://matheustavares.gitlab.io/gsoc/ I should have sent the link
earlier but, please, let me know if you have any comments on my
previous posts.
You can read my latest update here:
https://matheustavares.gitlab.io/posts/wee
Hi,
diffr is a diff highlighting tool that tries to improve on
diff-highlight by computing largest common subsequence on
hunks with a word resolution.
The resulting diff is displayed on top of the classic unified diff.
I share it here in the hope that it can be useful.
You can find it at https://
Junio C Hamano writes:
> * nd/index-dump-in-json (2019-06-26) 11 commits
> - SQUASH???
> - t3008: use the new SINGLE_CPU prereq
> - read-cache.c: dump "IEOT" extension as json
> - read-cache.c: dump "EOIE" extension as json
> - resolve-undo.c: dump "REUC" extension as json
> - fsmonitor.c:
On Tue, Jul 02, 2019 at 02:37:42PM -0700, Junio C Hamano wrote:
> >
> > +test_expect_success 'push --atomic also prevents branch creation' '
> > + # Make up/master
> > + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
> > + git init --bare "$d" &&
> > + git --git-dir="$d" config http.r
On Tue, Jul 02, 2019 at 01:16:46PM -0700, Junio C Hamano wrote:
> Emily Shaffer writes:
>
> > + if ((flags & TRANSPORT_PUSH_ATOMIC) && err) {
> > + for (struct ref *it = remote_refs; it; it = it->next)
> > + switch (it->status) {
> > +
Emily Shaffer writes:
> Teach transport-helper how to notice if skipping a ref during push would
> violate atomicity on the client side. We notice that a ref would be
> rejected, and choose not to send it, but don't notice that if the client
> has asked for --atomic we are violating atomicity if
Emily Shaffer writes:
> + if ((flags & TRANSPORT_PUSH_ATOMIC) && err) {
> + for (struct ref *it = remote_refs; it; it = it->next)
> + switch (it->status) {
> + case REF_STATUS_NONE:
> +
Johannes Schindelin writes:
> Please note that the problem is _not_ MinGW! The problem is that the
> non-JIT'ted code path is a lot more stringent than the JIT'ted one. So
> what you'd need is a prerequisite that tests whether the PCREv2 in use
> supports JIT'ted code or not, and skip the test ca
Am 02.07.19 um 19:20 schrieb Junio C Hamano:
> Derrick Stolee writes:
>
>> On 7/1/2019 2:35 PM, Junio C Hamano wrote:
>>> Jeff King writes:
>>>
> First, we create a (temporary) merge commit of both branches (M3)
>
>
> R1---R2---R3---R4---R5---R6---R7---M3
>
Dimitriy Ryazantcev writes:
> -void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes)
> +static void strbuf_humanise(struct strbuf *buf, off_t bytes,
> + int humanise_rate)
> {
> if (bytes > 1 << 30) {
> - strbuf_addf(buf, "%u.%2.2u GiB",
> +
On Tue, Jul 02, 2019 at 11:52:35AM -0700, Bryan Turner wrote:
> Sorry, I should have clarified my "--no-track" in my original message
> when I provided the example. I did "--no-track" because if I push
> "bturner-some-bugfix" to a server, I'm likely going to do something
> like "git push -u origin
"Quentin Nerden via GitGitGadget" writes:
> From: Quentin Nerden
>
> List the short form of options (e.g.: '-l') before the long form (e.g.
> '--local').
> This is to match the doc of git-add, git-commit, git-clean, git-branch...
>
> Signed-off-by: Quentin Nerden
> ---
> Documentation/git-clon
On Mon, 1 Jul 2019 at 14:33, Johannes Schindelin
wrote:
> On Sat, 29 Jun 2019, Mateusz Loskot wrote:
>
> > I have a script which I have used for long time, with numerous
> > git commands and one of commands is this trivial:
> >
> > git submodule foreach --recursive git clean -ffd
> >
> > I updated
Emily Shaffer writes:
> diff --git a/transport-helper.c b/transport-helper.c
> index c7e17ec9cb..6b05a88faf 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -853,6 +853,7 @@ static int push_refs_with_push(struct transport
> *transport,
> {
> int force_all = flags & TRANSP
On Tue, Jul 2, 2019 at 10:23 AM Alex Brachet-Mialot
wrote:
>
> Branches behave weirdly for case insensitive filesystems, and I'm
> guessing other things as well. For example say I am on a branch other
> than master, checking out 'Master' will _work_, I will of course be on
> the right branch but g
On Tue, Jul 2, 2019 at 10:36 AM Junio C Hamano wrote:
>
> In this whole thread, I have been wondering if I am missing
> something crucial, but now I am deeply puzzled why after many people
> made comments, nobody raises a question about the "--no-track" thing
> in the early message in the thread.
Johannes Schindelin writes:
>> +# Make master incompatible with up/master
>> +git reset --hard HEAD^ &&
>> +# Add a new branch
>> +git branch atomic &&
>> +# --atomic should roll back creation of up/atomic
>> +test_must_fail git push --atomic "$up" master atomic &&
>> +
Currenly the data rate in throughput_string(...) method is
output by simple strbuf_humanise_bytes(...) call and '/s' append.
But for proper translation of such string the translator needs
full context.
Add strbuf_humanise_rate(...) method to properly print out
localizable version of data rate ('3.
Duy Nguyen writes:
> I agree, this is not "canceling". I think this series causes conflicts
> with pw/clean-sequencer-state-upon-final-commit and the warning is
> accidentally enabled (partly my fault since I named the argument
> "verbose").
>
> Junio, in this conflict resolution (merging nd/swit
Philip Oakley writes:
>> I suspect the question is in regards to "What branch did I create
>> my local branch from?", especially given the pull request
>> reference.
>>
>> In other words, when I locally do:
>> git checkout --no-track -b bturner-some-bugfix origin/release/5.16
>>
>> release/5.16 i
Johannes Schindelin writes:
> Hi Stolee,
>
> On Mon, 1 Jul 2019, Derrick Stolee via GitGitGadget wrote:
>
>> From: Derrick Stolee
>>
>> Using 'ls -l' and parsing the columns to find file sizes is
>> problematic when the platform could report the owner as a name
>> with spaces. Instead, use the '
Phillip Wood writes:
>> As long as sed implementation used here does not do anything funny
>> to CR, I think the approach to strip everything before the last CR
>> on the line is sensible. As I am not familiar with how Windows port
>> of sed wants to treat a CR byte in the pattern, I am not sure
Branches behave weirdly for case insensitive filesystems, and I'm
guessing other things as well. For example say I am on a branch other
than master, checking out 'Master' will _work_, I will of course be on
the right branch but git status will say I am on 'Master' (expected
just 'master') and git b
Derrick Stolee writes:
> On 7/1/2019 2:35 PM, Junio C Hamano wrote:
>> Jeff King writes:
>>
First, we create a (temporary) merge commit of both branches (M3)
R1---R2---R3---R4---R5---R6---R7---M3
\ \ \ /
F1---F2--
Duy Nguyen writes:
>> So I'm all for a facility to have a setting to collectively opt-in to
>> new things early. But I think for such a thing we really should a) at
>> least in principle commit to making those things the default eventually
>
> Some features may be best enabled for certain setups.
On 01/07/2019 22:01, Junio C Hamano wrote:
"Phillip Wood via GitGitGadget" writes:
progress output before comparing it to the expected output. We do this
by removing everything before the final "\r" on each line as we don't
care about the progress indicator, but we do care about what is printe
Hi Rohit
Thanks for re-rolling again (and bearing with all the review rounds), I
think the range-diff looks good. These are ready for next as far as I'm
concerned.
Best Wishes
Phillip
On 02/07/2019 10:11, Rohit Ashiwal wrote:
Another revision of my patch which takes care of all the nits.
On 7/2/2019 7:09 AM, Duy Nguyen wrote:
> On Tue, Jul 2, 2019 at 5:47 PM Ævar Arnfjörð Bjarmason
> wrote:
>>
>>
>> On Wed, Jun 19 2019, Derrick Stolee via GitGitGadget wrote:
>>
>>> core.commitGraph::
>>> If true, then git will read the commit-graph file (if it exists)
>>> - to parse th
From: Quentin Nerden
To make the doc of git-clone easier to read,
refer to the long form of the options
(it is easier to guess what '--verbose' is doing than '-v').
Signed-off-by: Quentin Nerden
---
Documentation/git-clone.txt | 16
1 file changed, 8 insertions(+), 8 deletions
To make doc of git-clone easier to read, refer to the long version of the
options (it is easier to guess what --verbose is doing than -v).
Also: put the short options first, to match the doc of git-add, git-commit,
git-clean, git-branch...
Quentin Nerden (2):
docs: git-clone: refer to long form
From: Quentin Nerden
List the short form of options (e.g.: '-l') before the long form (e.g.
'--local').
This is to match the doc of git-add, git-commit, git-clean, git-branch...
Signed-off-by: Quentin Nerden
---
Documentation/git-clone.txt | 18 +-
1 file changed, 9 insertions(
Hi Emily,
On Mon, 1 Jul 2019, Emily Shaffer wrote:
> Teach transport-helper how to notice if skipping a ref during push would
> violate atomicity on the client side. We notice that a ref would be
> rejected, and choose not to send it, but don't notice that if the client
> has asked for --atomic w
Hi Ævar,
On Mon, 1 Jul 2019, Ævar Arnfjörð Bjarmason wrote:
> This v3 has a new patch (3/10) that I believe fixes the regression on
> MinGW Johannes noted in
> https://public-inbox.org/git/nycvar.qro.7.76.6.1907011515150...@tvgsbejvaqbjf.bet/
Yes.
However, I probably failed to mention another b
Hi Ævar,
On Mon, 1 Jul 2019, Ævar Arnfjörð Bjarmason wrote:
> On Mon, Jul 01 2019, Johannes Schindelin wrote:
>
> > On Fri, 28 Jun 2019, Junio C Hamano wrote:
> >
> >> * ab/no-kwset (2019-06-28) 9 commits
> >> - grep: use PCRE v2 for optimized fixed-string search
> >> - grep: remove the kwset o
Hi Stolee,
On Mon, 1 Jul 2019, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee
>
> Using 'ls -l' and parsing the columns to find file sizes is
> problematic when the platform could report the owner as a name
> with spaces. Instead, use the 'test-tool path-utils file-size'
> command
On 7/1/2019 2:35 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>>> First, we create a (temporary) merge commit of both branches (M3)
>>>
>>>
>>> R1---R2---R3---R4---R5---R6---R7---M3
>>> \ \ \ /
>>> F1---F2---M1---F3---F4---M2---F5
>>>
On Mon, Jul 01 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> This v3 has a new patch (3/10) that I believe fixes the regression on
>> MinGW Johannes noted in
>> https://public-inbox.org/git/nycvar.qro.7.76.6.1907011515150...@tvgsbejvaqbjf.bet/
>>
>> As noted in the updated
On Tue, Jul 2, 2019 at 5:47 PM Ævar Arnfjörð Bjarmason wrote:
>
>
> On Wed, Jun 19 2019, Derrick Stolee via GitGitGadget wrote:
>
> > core.commitGraph::
> > If true, then git will read the commit-graph file (if it exists)
> > - to parse the graph structure of commits. Defaults to false.
On Tue, Jul 02 2019, Duy Nguyen wrote:
> On Mon, Jul 1, 2019 at 10:32 PM Derrick Stolee via GitGitGadget
> wrote:
>> @@ -601,3 +602,22 @@ core.abbrev::
>> in your repository, which hopefully is enough for
>> abbreviated object names to stay unique for some time.
>> The m
On Wed, Jun 19 2019, Derrick Stolee via GitGitGadget wrote:
> core.commitGraph::
> If true, then git will read the commit-graph file (if it exists)
> - to parse the graph structure of commits. Defaults to false. See
> + to parse the graph structure of commits. Defaults to false, u
On Tue, Jul 02, 2019 at 04:03:09PM +0700, Duy Nguyen wrote:
> On Tue, Jul 02, 2019 at 10:06:11AM +0200, SZEDER Gábor wrote:
> > On Fri, Mar 29, 2019 at 05:38:59PM +0700, Nguyễn Thái Ngọc Duy wrote:
> > > After a successful switch, if a merge, cherry-pick or revert is ongoing,
> > > it is canceled.
On 01/07/2019 21:12, rsbec...@nexbridge.com wrote:
On July 1, 2019 3:48 PM, Bryan Turner wrote:
On Mon, Jul 1, 2019 at 12:35 PM Junio C Hamano wrote:
Eric Kulcyk writes:
[Overly long lines are not appreciated around here.]
We would like to track parent branches so that creating pull
request
On Mon, Jul 1, 2019 at 10:32 PM Derrick Stolee via GitGitGadget
wrote:
> @@ -601,3 +602,22 @@ core.abbrev::
> in your repository, which hopefully is enough for
> abbreviated object names to stay unique for some time.
> The minimum length is 4.
> +
> +core.featureAdoptionRat
git am or rebase have a --skip flag to skip the current commit if the
user wishes to do so. During a cherry-pick or revert a user could
likewise skip a commit, but needs to use 'git reset' (or in the case
of conflicts 'git reset --merge'), followed by 'git (cherry-pick |
revert) --continue' to skip
The previous commit introduced a --skip flag for cherry-pick and
revert. Update the advice messages, to tell users about this less
cumbersome way of skipping commits. Also add tests to ensure
everything is working fine.
Signed-off-by: Rohit Ashiwal
---
builtin/commit.c| 13 ++
Another revision of my patch which takes care of all the nits.
Rohit Ashiwal (5):
sequencer: add advice for revert
sequencer: rename reset_for_rollback to reset_merge
sequencer: use argv_array in reset_merge
cherry-pick/revert: add --skip option
cherry-pick/revert: advise using --skip
In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --`.
Introduce a separate advice message for `git revert`. Also change
the signature of `create_seq_dir` to handle which advice to display
selectively.
Signed-off-by: Rohit Ashiwal
---
Doc
We are on a path to teach cherry-pick/revert how to skip commits. To
achieve this, we could really make use of existing functions.
reset_for_rollback is one such function, but the name does not
intuitively suggest to use it to reset a merge, which it was born to
perform, see 539047c ("revert: intro
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/sequenc
On Tue, Jul 02, 2019 at 10:06:11AM +0200, SZEDER Gábor wrote:
> On Fri, Mar 29, 2019 at 05:38:59PM +0700, Nguyễn Thái Ngọc Duy wrote:
> > After a successful switch, if a merge, cherry-pick or revert is ongoing,
> > it is canceled. This behavior has been with us from the very early
> > beginning, so
On Fri, Mar 29, 2019 at 05:38:59PM +0700, Nguyễn Thái Ngọc Duy wrote:
> After a successful switch, if a merge, cherry-pick or revert is ongoing,
> it is canceled. This behavior has been with us from the very early
> beginning, soon after git-merge was created but never actually
> documented [1]. It
52 matches
Mail list logo
