Re: [PATCH] help: align the longest command in the command listing

2019-01-31 Thread Johannes Schindelin
Hi Duy, On Thu, 31 Jan 2019, Nguyễn Thái Ngọc Duy wrote: > "longest" is used to determine how many extra spaces we need to print > to keep the command description aligned. For the longest command, we > should print no extra space instead of one, or we'll get unaligned > output like this (notice t

Re: Broken interactive rebase text after some UTF-8 characters

2019-01-31 Thread Johannes Schindelin
Hi, On Thu, 31 Jan 2019, Junio C Hamano wrote: > Phillip Wood writes: > > >> Are we misusing C formats? > > > > The C standard and POSIX both say that the * refers to the maximum > > number of bytes to print but it looks like it is being treated as the > > maximum number of characters on OpenIn

Re: New command/tool: git filter-repo

2019-01-31 Thread Elijah Newren
Hi Roberto, First of all, thanks for the feedback, and for the awesome work on BFG repo filter! On Fri, Feb 1, 2019 at 12:36 AM Roberto Tyley wrote: > > On Thu, 31 Jan 2019 at 22:37, Elijah Newren wrote: > > On Thu, Jan 31, 2019 at 8:09 PM Junio C Hamano wrote: > > > Elijah Newren writes: > >

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Jiang Xin
Jiang Xin 于2019年2月1日周五 下午3:23写道: > > Eric Sunshine 于2019年2月1日周五 下午2:11写道: > > > Nice chart, will edit test_description as follows: > > > > > > test_description='git pack-redundant test > > > > > > In order to test git-pack-redundant, we will create a number of > > > redundant > > > pa

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Jiang Xin
Eric Sunshine 于2019年2月1日周五 下午2:11写道: > > On Fri, Feb 1, 2019 at 12:44 AM Jiang Xin wrote: > >> Junio C Hamano 于2019年2月1日周五 上午5:44写道: > > > Move this outside loop, not for efficiency but for clarity. This > > > helper function creates a single empty tree and bunch of commits > > > that hold the s

Re: Comparing rebase --am with --interactive via p3400

2019-01-31 Thread Johannes Schindelin
Hi Elijah, On Fri, 1 Feb 2019, Johannes Schindelin wrote: > as discussed at the Contributors' Summit, I ran p3400 as-is (i.e. with the > --am backend) and then with --keep-empty to force the interactive backend > to be used. Here are the best of 10, on my relatively powerful Windows 10 > laptop,

Re: Worktree creation race

2019-01-31 Thread Duy Nguyen
Thanks for including me. Apparently I did miss some emails :) On Fri, Feb 1, 2019 at 1:27 PM Eric Sunshine wrote: > > On Mon, Jan 28, 2019 at 7:58 AM Marketa Calabkova wrote: > > On 15/01/2019 15:03, Marketa Calabkova wrote: > > > I am writing to report a bug. The original report is from my coll

Re: [PATCH 6/8] checkout: add --cached option

2019-01-31 Thread Duy Nguyen
On Fri, Feb 1, 2019 at 2:05 AM Junio C Hamano wrote: > > Duy Nguyen writes: > > > I've changed my mind. I'm not using --index and --cached for "git > > restore" (formerly "git restore-files"). So how about this? > > > > git restore --from= will update both the index and > > worktree. > > > > gi

Re: Worktree creation race

2019-01-31 Thread Eric Sunshine
On Mon, Jan 28, 2019 at 7:58 AM Marketa Calabkova wrote: > On 15/01/2019 15:03, Marketa Calabkova wrote: > > I am writing to report a bug. The original report is from my colleague, I > > am also providing his suggestions. > > > > There is insufficient locking for worktree addition. Adding worktre

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 12:44 AM Jiang Xin wrote: >> Junio C Hamano 于2019年2月1日周五 上午5:44写道: > > Move this outside loop, not for efficiency but for clarity. This > > helper function creates a single empty tree and bunch of commits > > that hold the same empty tree, arranged as a single strand of > >

Comparing rebase --am with --interactive via p3400

2019-01-31 Thread Johannes Schindelin
Hi Elijah, as discussed at the Contributors' Summit, I ran p3400 as-is (i.e. with the --am backend) and then with --keep-empty to force the interactive backend to be used. Here are the best of 10, on my relatively powerful Windows 10 laptop, with current `master`. With regular rebase --am: 3400.

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Jiang Xin
Junio C Hamano 于2019年2月1日周五 上午5:44写道: > > +create_commits () { > > + parent= > > + for name in A B C D E F G H I J K L M N O P Q R > > + do > > + test_tick && > > + T=$(git write-tree) && > > Move this outside loop, not for efficiency but for clarity. This > hel

[no subject]

2019-01-31 Thread 8083391180
Thanks

[no subject]

2019-01-31 Thread 8083391180
:-(

[PATCH v4 3/8] ref-filter: add the metas namespace to ref-filter

2019-01-31 Thread sxenos
From: Stefan Xenos The metas namespace will contain refs for changes in progress. Add support for searching this namespace. Signed-off-by: Stefan Xenos --- ref-filter.c | 8 ++-- ref-filter.h | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ref-filter.c b/ref-filte

[PATCH v4 7/8] evolve: implement the git change command

2019-01-31 Thread sxenos
From: Stefan Xenos Implement the git change update command, which are sufficient for constructing change graphs. For example, to create a new change (a stable name) that refers to HEAD: git change update -c HEAD To record a rebase or amend in the change graph: git change update -c -r To re

[PATCH v4 8/8] evolve: add the git change list command

2019-01-31 Thread sxenos
From: Stefan Xenos This command lists the ongoing changes from the refs/metas namespace. Signed-off-by: Stefan Xenos --- builtin/change.c | 51 1 file changed, 51 insertions(+) diff --git a/builtin/change.c b/builtin/change.c index 06cbb50679..

[PATCH v4 6/8] evolve: add support for writing metacommits

2019-01-31 Thread sxenos
From: Stefan Xenos metacommit.c supports the creation of metacommits and adds the API needed to create and update changes. Create the "modify_change" function that can be called from modification commands like "rebase" and "git amend" to record obsolescences in the change graph. Create the "rec

[PATCH v4 5/8] evolve: add the change-table structure

2019-01-31 Thread sxenos
From: Stefan Xenos A change table stores a list of changes, and supports efficient lookup from a commit hash to the list of changes that reference that commit directly. It can be used to look up content commits or metacommits at the head of a change, but does not support lookup of commits refere

[PATCH v4 4/8] evolve: add support for parsing metacommits

2019-01-31 Thread sxenos
From: Stefan Xenos This patch adds the get_metacommit_content method, which can classify commits as either metacommits or normal commits, determine whether they are abandoned, and extract the content commit's object id from the metacommit. Signed-off-by: Stefan Xenos --- Makefile|

[PATCH v4 1/8] technical doc: add a design doc for the evolve command

2019-01-31 Thread sxenos
From: Stefan Xenos This document describes what a change graph for git would look like, the behavior of the evolve command, and the changes planned for other commands. Signed-off-by: Stefan Xenos --- Documentation/technical/evolve.txt | 1034 1 file changed, 1034 i

[PATCH v4 2/8] sha1-array: implement oid_array_readonly_contains

2019-01-31 Thread sxenos
From: Stefan Xenos Implement a "readonly_contains" function for oid_array that won't sort the array if it is unsorted. This can be used to test containment in the rare situations where the array order matters. The function has intentionally been given a name that is more cumbersome than the "loo

Re: [PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 6:04 AM Duy Nguyen wrote: > On Thu, Jan 31, 2019 at 5:49 PM Eric Sunshine wrote: > > On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy > > wrote: > > > +NOTES > > > +- > > > +If a branch is associated with the working tree, 'HEAD' points to this > > > +branch. Whe

Re: [PATCH v4 14/14] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

2019-01-31 Thread Junio C Hamano
SZEDER Gábor writes: > On Wed, Jan 30, 2019 at 12:56:34PM -0800, Jeff Hostetler via GitGitGadget > wrote: >> Create unit tests for Trace2. > >> diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh >> new file mode 100755 >> index 00..517d5514df >> --- /dev/null >> +++ b/t/t0212

Re: [PATCH v4 01/14] trace2: Documentation/technical/api-trace2.txt

2019-01-31 Thread Junio C Hamano
Jeff Hostetler writes: > I'd rather not use the term "subcommand" because it already has mixed > usage. > [] See git_more_info_string[] in git.c and list_all_cmd_help() >in help.c where both "command" and "subcommand" are used >interchangeably. > [] And yet another completely different us

Re: New command/tool: git filter-repo

2019-01-31 Thread Roberto Tyley
On Thu, 31 Jan 2019 at 22:37, Elijah Newren wrote: > On Thu, Jan 31, 2019 at 8:09 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > > > git-filter-repo[1], a filter-branch-like tool for rewriting repository > > > history, is ready for more widespread testing and feedback. The rough > > >

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread Junio C Hamano
Jeff Hostetler writes: > On 1/31/2019 2:45 PM, Jeff Hostetler wrote: >> > ... >> >> I can undo my formatting changes if we want to update the settings. >> I'll give that a try if there are no objections. >> > > I'll push up a V5 in the morning that adds the foreach > macros to the .clang-format a

Re: [PATCH v4 14/14] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 12:56:34PM -0800, Jeff Hostetler via GitGitGadget wrote: > Create unit tests for Trace2. > diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh > new file mode 100755 > index 00..517d5514df > --- /dev/null > +++ b/t/t0212-trace2-event.sh > @@ -0,0 +1,234 @

Re: [PATCH v6 1/3] ref-filter: add worktreepath atom

2019-01-31 Thread Jeff King
On Thu, Jan 31, 2019 at 12:53:24PM -0800, Nickolai Belakovski wrote: > So where does that leave us for this series? We could move hashmap > back into used_atom, but if a user entered > --format="%(worktreepath)%(worktreepath:)" we'd end up freeing > worktrees twice. Not that that should stop us -

Re: [PATCH v6 1/3] ref-filter: add worktreepath atom

2019-01-31 Thread Jeff King
On Thu, Jan 31, 2019 at 01:42:14PM -0800, Junio C Hamano wrote: > > So I'd much rather see us parse the format into a real tree of nodes, > > and figure out (once) which properties of each object are required to > > fulfill that. Then for each object, we grab those properties, and then > > walk th

Re: [PATCH v4 03/14] trace2: collect platform-specific process information

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 12:56:24PM -0800, Jeff Hostetler via GitGitGadget wrote: > Add optional platform-specific code to log information about > the current process. > > On Windows, this includes whether git.exe is running under a > debugger and information about the ancestors of the process. >

Re: Git annex possible bug

2019-01-31 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 31 2019, Robert Cathles wrote: > We use git annex and found an issue where one machine that had run > 'git annex sync' and 'git annex sync --content' was not reporting any > issues, but any other machines were report 99 issues when running 'git > annex get'. > > The message for each

Re: [PATCH v4 01/14] trace2: Documentation/technical/api-trace2.txt

2019-01-31 Thread Jeff Hostetler
On 1/31/2019 9:11 AM, SZEDER Gábor wrote: On Wed, Jan 30, 2019 at 12:56:21PM -0800, Jeff Hostetler via GitGitGadget wrote: From: Jeff Hostetler diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt +== Public API +=== Command Detail Messages +

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread Jeff Hostetler
On 1/31/2019 2:45 PM, Jeff Hostetler wrote: ... I can undo my formatting changes if we want to update the settings. I'll give that a try if there are no objections. I'll push up a V5 in the morning that adds the foreach macros to the .clang-format and updates the code accordingly. Curre

Re: [PATCH v6 1/3] ref-filter: add worktreepath atom

2019-01-31 Thread Junio C Hamano
Jeff King writes: > On Thu, Jan 24, 2019 at 11:30:20AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > What if you have other atoms that need worktrees? E.g., does >> > %(worktreepath:foo) use the same used_atom slot? What if we have another >> > worktree-related atom? >> > ... >> >

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Junio C Hamano
Jiang Xin writes: > diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh > new file mode 100755 > index 00..710fe9884c > --- /dev/null > +++ b/t/t5323-pack-redundant.sh > @@ -0,0 +1,322 @@ > +#!/bin/sh > +# > +# Copyright (c) 2018 Jiang Xin > +# > + > +test_description='git

Re: Broken interactive rebase text after some UTF-8 characters

2019-01-31 Thread Junio C Hamano
Phillip Wood writes: >> Are we misusing C formats? > > The C standard and POSIX both say that the * refers to the maximum > number of bytes to print but it looks like it is being treated as the > maximum number of characters on OpenIndiana. > > Johannes - Perhaps we should change it to use fwrite

Re: Broken interactive rebase text after some UTF-8 characters

2019-01-31 Thread Alban Gruin
Hi Phillip, Le 31/01/2019 à 21:40, Phillip Wood a écrit : > Hi Alban > > On 31/01/2019 17:43, Alban Gruin wrote: >> Hi Phillip and Michal, >> >> I think I found the bug. > > Good find! Which os are you on? I’m on Linux, but I found this on OpenIndiana running under QEMU. -- Alban

Re: [PATCH v6 1/3] ref-filter: add worktreepath atom

2019-01-31 Thread Nickolai Belakovski
So where does that leave us for this series? We could move hashmap back into used_atom, but if a user entered --format="%(worktreepath)%(worktreepath:)" we'd end up freeing worktrees twice. Not that that should stop us - that scenario is one where user input isn't sensible and personally I don't th

Re: New command/tool: git filter-repo

2019-01-31 Thread Elijah Newren
On Thu, Jan 31, 2019 at 9:57 AM Elijah Newren wrote: > > Hi everyone, > > git-filter-repo[1], a filter-branch-like tool for rewriting repository > history, is ready for more widespread testing and feedback. ... > What's the future? (Core command of git.git? place it in contrib? keep it > in a s

Re: [PATCH v6 07/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2019-01-31 Thread Phillip Wood
Hi Alban On 31/01/2019 20:37, Alban Gruin wrote: Hi Phillip, Le 31/01/2019 à 15:30, Phillip Wood a écrit : Hi Alban On 29/01/2019 15:01, Alban Gruin wrote: This refactors sequencer_add_exec_commands() to work on a todo_list to avoid redundant reads and writes to the disk. Instead of inserti

Re: Broken interactive rebase text after some UTF-8 characters

2019-01-31 Thread Phillip Wood
Hi Alban On 31/01/2019 17:43, Alban Gruin wrote: Hi Phillip and Michal, I think I found the bug. Good find! Which os are you on? If you look at .git/rebase-merge/git-rebase-todo.backup, which is created before the editor is opened, you can see that it does not have this problem. In between

Re: New command/tool: git filter-repo

2019-01-31 Thread Elijah Newren
On Thu, Jan 31, 2019 at 8:09 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > git-filter-repo[1], a filter-branch-like tool for rewriting repository > > history, is ready for more widespread testing and feedback. The rough > > edges I previously mentioned have been fixed, and it has seve

Re: mk/use-size-t-in-zlib [was: Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)]

2019-01-31 Thread Torsten Bögershausen
On Thu, Jan 31, 2019 at 06:59:17PM +0100, Thomas Braun wrote: > > Junio C Hamano hat am 29. Januar 2019 um 23:15 > > geschrieben: > > [...] > > > * mk/use-size-t-in-zlib (2018-10-15) 1 commit > > - zlib.c: use size_t for size > > > > The wrapper to call into zlib followed our long tradition to

Re: [PATCH v6 07/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2019-01-31 Thread Alban Gruin
Hi Phillip, Le 31/01/2019 à 15:30, Phillip Wood a écrit : > Hi Alban > > On 29/01/2019 15:01, Alban Gruin wrote: >> This refactors sequencer_add_exec_commands() to work on a todo_list to >> avoid redundant reads and writes to the disk. >> >> Instead of inserting the `exec' commands between the ot

Re: Possible minor bug in Git

2019-01-31 Thread Torsten Bögershausen
On Thu, Jan 31, 2019 at 09:29:28AM +0200, Angelo Melonas wrote: > Just to clarify, I made a mistake above. Instead of "untracked", I > meant "unstaged". > I apologise for the confusion. > > On Thu, Jan 31, 2019 at 9:01 AM Angelo Melonas > wrote: > > > > Good day, > > > > I found a potential bug i

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 1:17 PM Jeremy Sequoia wrote: > > On Jan 31, 2019, at 09:57, Junio C Hamano wrote: > > I still do not see what problem you need a "solution" for in the > > first place---I saw a few comments asking it in the thread, but saw > > no answer. ppc/sha1ppc.S is already tracked,

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread Jeff Hostetler
On 1/31/2019 1:51 PM, Junio C Hamano wrote: Jeff Hostetler writes: -+ for_each_builtin(j, tgt_j) { ++ for_each_builtin(j, tgt_j) ++ { + tgt_j->pfn_term(); + } Our CodingGuidelines prefer the opening brace on the sa

Re: [PATCH v7 3/6] pack-redundant: new algorithm to find min packs

2019-01-31 Thread Junio C Hamano
Jiang Xin writes: > From: Sun Chao > > When calling `git pack-redundant --all`, if there are too many local > packs and too many redundant objects within them, the too deep iteration > of `get_permutations` will exhaust all the resources, and the process of > `git pack-redundant` will be killed.

Re: New command/tool: git filter-repo

2019-01-31 Thread Junio C Hamano
Elijah Newren writes: > git-filter-repo[1], a filter-branch-like tool for rewriting repository > history, is ready for more widespread testing and feedback. The rough > edges I previously mentioned have been fixed, and it has several useful > features already, though more development work is ong

Re: [PATCH 6/8] checkout: add --cached option

2019-01-31 Thread Junio C Hamano
Duy Nguyen writes: > I've changed my mind. I'm not using --index and --cached for "git > restore" (formerly "git restore-files"). So how about this? > > git restore --from= will update both the index and worktree. > > git restore --from= --keep-index will not update the index > > git restore --

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread Junio C Hamano
Jeff Hostetler writes: >>> -+for_each_builtin(j, tgt_j) { >>> ++for_each_builtin(j, tgt_j) >>> ++{ >>>+tgt_j->pfn_term(); >>>+} >> >> Our CodingGuidelines prefer the opening brace on the same line after >> the if/for/while/struct/etc.

Re: [PATCH v4 2/7] pretty: allow %(trailers) options with explicit value

2019-01-31 Thread Anders Waldenborg
Оля Тележная writes: >> Oh my. I wasn't aware that there was a totally separate string >> interpolation implementation used for ref filters. That one has >> separated parsing, making it more amenable to good error handling. >> I wonder if that could be generalized and reused for pretty formats. >

Re: [PATCH v4 00/14] Trace2 tracing facility

2019-01-31 Thread Junio C Hamano
"Jeff Hostetler via GitGitGadget" writes: > Sorry to spam the list, but here is V4. After building V3 on 3 platforms > without error and submitting, the compilers on platforms 4 and 5 complained > about a variable declaration. (sigh) [] fix declaration after first > statement [] add -DNO_UNIX_SOC

Re: [PATCH 00/19] Add new command "switch"

2019-01-31 Thread Junio C Hamano
Duy Nguyen writes: >> Adding '--soft|--hard' from 'git reset' would go in the opposite >> direction. > > If it's about the confusion, I think we can avoid it. If it's about > the one-command-do-all, I think it still fits in the main topic of > git-switch, which is about switching. But in git-rese

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-31 Thread Jeremy Sequoia
Sent from my iPhone... > On Jan 31, 2019, at 09:57, Junio C Hamano wrote: > > Jeremy Huddleston Sequoia writes: > >>> What you probably want instead is >>> >>># Accommodate for case-insensitive filesystems where *.s would catch >>>!ppc/sha1ppc.S >>> >>> after the `*.[aos]` line. >

Re: [PATCH 00/19] Add new command "switch"

2019-01-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This is the first half of the previous "switch-branch and > restore-files" RFC series [1]. I only focus on switch-branch for now > because it's already getting long and I still have some work to do on > restore-files. Exciting ;-) This will probably become the be

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-31 Thread Junio C Hamano
Jeremy Huddleston Sequoia writes: A concern shared with 13/13 is this. While it may not hurt too much to look at one extra location even on non-Apple platform, it probably is a mistake to have this xcode specific change in generic part of the system like config.c or

Re: t5702 failing under ASan on master

2019-01-31 Thread Junio C Hamano
"brian m. carlson" writes: > On Wed, Jan 30, 2019 at 05:07:20PM +0700, Duy Nguyen wrote: >> If I understand ASan report correctly alternate_shallow_file memory is >> already gone after the first fetch, when we update the shallow file. >> But we're doing two fetches in the same process (the tag ba

mk/use-size-t-in-zlib [was: Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)]

2019-01-31 Thread Thomas Braun
> Junio C Hamano hat am 29. Januar 2019 um 23:15 > geschrieben: [...] > * mk/use-size-t-in-zlib (2018-10-15) 1 commit > - zlib.c: use size_t for size > > The wrapper to call into zlib followed our long tradition to use > "unsigned long" for sizes of regions in memory, which have been > upd

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-31 Thread Junio C Hamano
Jeremy Huddleston Sequoia writes: >> What you probably want instead is >> >> # Accommodate for case-insensitive filesystems where *.s would catch >> !ppc/sha1ppc.S >> >> after the `*.[aos]` line. > > Thanks for the suggestion. I didn't know that was possible with > .gitignore. That'

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-31 Thread Junio C Hamano
Denton Liu writes: > On Tue, Jan 29, 2019 at 02:15:36PM -0800, Junio C Hamano wrote: >> * dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits >> - init docs: correct a punctuation typo >> - merge: add scissors line on merge conflict >> - merge: cleanup messages like commit >> - t7600: clean

Re: What's cooking in git.git (Jan 2019, #05; Tue, 29)

2019-01-31 Thread Junio C Hamano
Jeff Hostetler writes: >> A more structured way to obtain execution trace has been added. >> >> Ready? > > I'm about to send in a V3 that includes an updated design doc > and addresses most of the clang-format suggestions. > > The CI build reports that my V3 collides with a change > added yes

Re: Broken interactive rebase text after some UTF-8 characters

2019-01-31 Thread Alban Gruin
Hi Phillip and Michal, I think I found the bug. If you look at .git/rebase-merge/git-rebase-todo.backup, which is created before the editor is opened, you can see that it does not have this problem. In between, transform_todos() is called and causes the problem reported by Michal. This seems to

Git annex possible bug

2019-01-31 Thread Robert Cathles
We use git annex and found an issue where one machine that had run 'git annex sync' and 'git annex sync --content' was not reporting any issues, but any other machines were report 99 issues when running 'git annex get'. The message for each file was that it was not known to exist on any repo. doin

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread Jeff Hostetler
On 1/31/2019 9:38 AM, SZEDER Gábor wrote: On Wed, Jan 30, 2019 at 11:51:04AM -0800, Jeff Hostetler via GitGitGadget wrote: V3 addresses: [] incorporate most of the suggestions from clang-format. Range-diff vs v2: 1: 1a90de9dab < -: -- trace2: Documentation/technical/api-tra

Re: [PATCH 00/19] Add new command "switch"

2019-01-31 Thread Duy Nguyen
On Thu, Jan 31, 2019 at 8:37 PM SZEDER Gábor wrote: > > On Wed, Jan 30, 2019 at 04:48:12PM +0700, Nguyễn Thái Ngọc Duy wrote: > > The > > only one left is adding options similar to "git reset" (but with > > better names this time than --soft and --hard, hopefully). > > Oh no, what for?! As the co

Re: [PATCH v3 00/14] Trace2 tracing facility

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 11:51:04AM -0800, Jeff Hostetler via GitGitGadget wrote: > V3 addresses: > [] incorporate most of the suggestions from clang-format. > Range-diff vs v2: > > 1: 1a90de9dab < -: -- trace2: > Documentation/technical/api-trace2.txt > -: -- > 1: 60b56

Re: [PATCH v6 07/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

2019-01-31 Thread Phillip Wood
Hi Alban On 29/01/2019 15:01, Alban Gruin wrote: This refactors sequencer_add_exec_commands() to work on a todo_list to avoid redundant reads and writes to the disk. Instead of inserting the `exec' commands between the other commands and re-parsing the buffer at the end, they are appended to th

Re: [PATCH v4 01/14] trace2: Documentation/technical/api-trace2.txt

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 12:56:21PM -0800, Jeff Hostetler via GitGitGadget wrote: > From: Jeff Hostetler > diff --git a/Documentation/technical/api-trace2.txt > b/Documentation/technical/api-trace2.txt > +== Public API > +=== Command Detail Messages > + > +These are concerned with describing th

Re: [PATCH 00/19] Add new command "switch"

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 04:48:12PM +0700, Nguyễn Thái Ngọc Duy wrote: > The > only one left is adding options similar to "git reset" (but with > better names this time than --soft and --hard, hopefully). Oh no, what for?! As the commit message or patch 19/19 'doc: promote "git switch"' states:

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-31 Thread SZEDER Gábor
On Wed, Jan 30, 2019 at 04:48:20PM +0700, Nguyễn Thái Ngọc Duy wrote: > diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt > new file mode 100644 > index 00..953c9747b2 > +--orphan :: > + Create a new 'orphan' branch, named , started from > + and switch to it

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-31 Thread SZEDER Gábor
On Thu, Jan 31, 2019 at 12:29:01PM +0700, Duy Nguyen wrote: > > > +EXAMPLES > > > +To check out commit "HEAD~3" for temporary inspection or experiment > > > +without creating a new branch: > > > + > > > + > > > +$ git switch --detach HEAD~3 > > > +HEAD is now at 9fc9555312 Merge branch

Good day,

2019-01-31 Thread Mrs. Annabelle Edo.
Hi, Dear. It is about my late client a national of your country .I expect your immediate response for More details about his ( WILL ).. Regards. Mrs. Annabelle Edo.

Re: [PATCH 19/19] doc: promote "git switch"

2019-01-31 Thread Duy Nguyen
On Thu, Jan 31, 2019 at 2:39 PM Eric Sunshine wrote: > > diff --git a/builtin/clone.c b/builtin/clone.c > > @@ -491,7 +491,7 @@ static enum { > > static const char junk_leave_repo_msg[] = > > N_("Clone succeeded, but checkout failed.\n" > > "You can inspect what was checked out with 'git sta

Re: [PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Duy Nguyen
On Thu, Jan 31, 2019 at 5:49 PM Eric Sunshine wrote: > > On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy > wrote: > > The description of git-commit jumps right into the commit content, which > > is important, but it fails to mention how the commit is "added" to the > > repository. Update th

Re: [PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy wrote: > The description of git-commit jumps right into the commit content, which > is important, but it fails to mention how the commit is "added" to the > repository. Update the first paragraph saying a bit more about branch > update to fill t

Re: [PATCH] reflog: specify default pretty format in config

2019-01-31 Thread Roland Hieber
On Wed, Jan 30, 2019 at 07:22:49PM +0100, Matthieu Moy wrote: > Roland Hieber writes: > > > The output of git-reflog is currently only customizable by calling > > reflog with --pretty=... or overriding the default "oneline" pretty > > format in the configuration. > > Sounds like a good idea to m

[PATCH] help: align the longest command in the command listing

2019-01-31 Thread Nguyễn Thái Ngọc Duy
"longest" is used to determine how many extra spaces we need to print to keep the command description aligned. For the longest command, we should print no extra space instead of one, or we'll get unaligned output like this (notice the "checkout" line): grow, mark and tweak your common history

[PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Nguyễn Thái Ngọc Duy
The description of git-commit jumps right into the commit content, which is important, but it fails to mention how the commit is "added" to the repository. Update the first paragraph saying a bit more about branch update to fill this gap. While at there, add a couple linkgit references when the co

New command/tool: git filter-repo

2019-01-31 Thread Elijah Newren
Hi everyone, git-filter-repo[1], a filter-branch-like tool for rewriting repository history, is ready for more widespread testing and feedback. The rough edges I previously mentioned have been fixed, and it has several useful features already, though more development work is ongoing (docs are a b

Re: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig

2019-01-31 Thread Jeremy Huddleston Sequoia
> On Jan 30, 2019, at 16:01, Jonathan Nieder wrote: > > Hi, > > Jeremy Huddleston Sequoia wrote: > >> Unfortunately, I was quick to celebrate. This picks up the bundled >> file instead of a system-wide file. I'd love it if we could still >> honor system-wide config/attributes in addition t

Re: [RFC PATCH] pack-refs: fail on falsely sorted packed-refs

2019-01-31 Thread Max Kirillov
On Wed, Jan 30, 2019 at 06:31:34PM -0500, Eric Sunshine wrote: > On Wed, Jan 30, 2019 at 6:21 PM Max Kirillov wrote: >> + strbuf_addf(err, "broken sorting in >> packed-refs: '%s' > '%s'", >> + prev_ref.buf, >> +