Re: [PATCH v2 0/5] am/rebase: share read_author_script()

2018-10-25 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > Thanks to Eric for his feedback on v1. I've rerolled based on > that. Patches 1 & 2 are new and try to address some of the concerns > Eric raised, particularly the error handling for a badly edited author > script. See the notes on patches 4 & 5 for

Re: [PATCH v2 2/5] am: improve author-script error reporting

2018-10-25 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > If there are errors in a user edited author-script there was no > indication of what was wrong. This commit adds some specific error messages > depending on the problem. It also relaxes the requirement that the > variables appear in a specific order

Urgent

2018-10-25 Thread Mr. David Abraham
My Greeting, How are you today?Did you receive the letter i sent to you. Please answer me. Best Regard, Mr. David Abraham

Re: [PATCH v2 1/5] am: don't die in read_author_script()

2018-10-25 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > The caller is already prepared to handle errors returned from this > function so there is no need for it to die if it cannot read the file. > > Suggested-by: Eric Sunshine > Signed-off-by: Phillip Wood > --- > builtin/am.c | 3 ++- > 1 file

Re: [PATCH v6 00/10] Make submodules work if .gitmodules is not checked out

2018-10-25 Thread Junio C Hamano
Antonio Ospite writes: > this series teaches git to try and read the .gitmodules file from the > index (:.gitmodules) or from the current branch (HEAD:.gitmodules) when > the file is not readily available in the working tree. What you said in [*1*] the discussion on [09/10] sounded like you are

Re: Mirror of git.git on gitlab.com

2018-10-25 Thread Jeff King
On Mon, Oct 22, 2018 at 02:41:19PM +0900, Junio C Hamano wrote: > > As an aside, I noticed that > > https://github.com/git/sha1collisiondetection/ has never worked in > > combination with git.git, i.e. it's cloned at a version that pre-dates > > the initial introduction of the

Re: [PATCH v4 4/7] revision.c: begin refactoring --topo-order logic

2018-10-25 Thread Junio C Hamano
Derrick Stolee writes: >     time git log --topo-order -10 master >/dev/null > >     time git log --topo-order -10 maint..master >/dev/null > > I get 0.39s for the first call and 0.01s for the second. (Note: I > specified "-10" to ensure we are only writing 10 commits and the > output size does

Re: [PATCH v2 00/13] Offer to run CI/PR builds in Azure Pipelines

2018-10-25 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > For a long time already, we have Git's source code continuously tested via > Travis CI, see e.g. https://travis-ci.org/git/git/builds/421738884. It has > served us well, and more and more developers actually pay attention and > benefit from the

Re: [PATCH v2 00/15] Hash function transition part 15

2018-10-25 Thread Junio C Hamano
"brian m. carlson" writes: > This is the fifteenth series in the ongoing hash function transition. > > This series includes several conversions to use the_hash_algo, combined > with some use of parse_oid_hex and GIT_MAX_RAWSZ. > > Changes from v1: > * Fix several other substantially similar

Re: [PATCH] sequencer: cleanup for gcc 8.2.1 warning

2018-10-25 Thread Junio C Hamano
Carlo Arenas writes: > would something like this work better? (not to apply, and probably mangled) At least call it "create_empty_file(path)" instead. "touch" is primarily to update the last-modified-time timestamp of a file. If the file does not exist, it is created while doing so, but when

Re: [PATCH] sequencer: cleanup for gcc 8.2.1 warning

2018-10-25 Thread Carlo Arenas
On Wed, Oct 24, 2018 at 11:22 PM Junio C Hamano wrote: > and they would read naturally. But may be it is a bit too cute an > idea? I dunno. my first idea was to replace it with a helper called touch_file, since I was expecting it will be a popular operation as flag files are common in shell

Re: [PATCH] l10n: vi.po: fix typo in pack-objects

2018-10-25 Thread Trần Ngọc Quân
Thank you for your patch. This typo probably is my false. On 10/25/18 2:01 AM, Minh Nguyen wrote: ---  po/vi.po | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/vi.po b/po/vi.po index bc79319b6..e646825ed 100644 --- a/po/vi.po +++ b/po/vi.po @@ -13663,7 +13663,7 @@

Re: [PATCH] worktree: refactor lock_reason_valid and lock_reason to be more sensible

2018-10-25 Thread Junio C Hamano
nbelakov...@gmail.com writes: > From: Nickolai Belakovski > > lock_reason_valid is renamed to is_locked and lock_reason is removed as > a field of the worktree struct. Lock reason can be obtained instead by a > standalone function. > > This is done in order to make the worktree struct more

Re: [PATCH] http: give curl version warnings consistently

2018-10-25 Thread Jeff King
On Thu, Oct 25, 2018 at 12:29:19PM +0900, Junio C Hamano wrote: > When a requested feature cannot be activated because the version of > cURL library used to build Git with is too old, most of the codepaths > give a warning like "$Feature is not supported with cURL < $Version", > marked for l10n.

Re: [PATCH] sequencer: cleanup for gcc 8.2.1 warning

2018-10-25 Thread Junio C Hamano
Junio C Hamano writes: > I'd have to say that the ability to create an empty file is more > important in the longer term. Can't the workaround be done to > write_file() instead? I actually do not mind if the solution were > to introduce a newhelper "write_empty_file()", but the way it is >

Re: [PATCH] Poison gettext with the Ook language

2018-10-25 Thread Jeff King
On Thu, Oct 25, 2018 at 12:52:55PM +0900, Junio C Hamano wrote: > Duy Nguyen writes: > > > The person who writes > > > > printf(_("%s"), getenv("foo")); > > > > may not go through the same thought process as with complexFunction(). > > If _() calls getenv(), because you the order of parameter

<    1   2