Re: [PATCH v3 10/12] files-backend: make reflog iterator go through per-worktree reflog

On Sat, Apr 22, 2017 at 10:05:02AM +0200, Michael Haggerty wrote: > I find this implementation confusing: > > * `if (iter->worktree_dir_iterator)` sounds like it should mean > that we are iterating over worktree references but it really means > that we are iterating over the common references

[L10N] Kickoff of translation for Git 2.13.0 round 1

Hi, Git v2.13.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 96 updated messages need to be translated since last update: l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed) Generate po/git.pot from v2.13.0-rc0 for git v2.13.0 l10n round 1.

Re: [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 22.04.2017 um 23:52 schrieb Johannes Sixt: Am 22.04.2017 um 21:22 schrieb Peter Krefting: @@ -279,6 +299,7 @@ static int write_zip_entry(struct archiver_args *args, int is_binary = -1; const char *path_without_prefix = path + args->baselen; unsigned int creator_version = 0; +

[PATCH v2] archive-zip: Add zip64 headers when file size is too large for 32 bits

If the size of the files in the archive cannot be expressed in 32 bits, or the offset in the zip file itself, add zip64 local headers with the actual size. If we do find such entries, we also set a flag to force the creation of a zip64 end of central directory record. Signed-off-by: Peter

Re: [PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits

Am 22.04.2017 um 21:22 schrieb Peter Krefting: @@ -279,6 +299,7 @@ static int write_zip_entry(struct archiver_args *args, int is_binary = -1; const char *path_without_prefix = path + args->baselen; unsigned int creator_version = 0; +int clamped = 0; crc = crc32(0, NULL,

[GSoC][RFC/PATCH v2] submodule: port subcommand foreach from shell to C

This aims to make git-submodule foreach a builtin. This is the very first step taken in this direction. Hence, 'foreach' is ported to submodule--helper, and submodule--helper is called from git-submodule.sh. The code is split up to have one function to obtain all the list of submodules and a

[PATCH] archive-zip: Add zip64 headers when file size is too large for 32 bits

If the size of the files in the archive cannot be expressed in 32 bits, or the offset in the zip file itself, add zip64 local headers with the actual size. If we do find such entries, we also set a flag to force the creation of a zip64 end of central directory record. Signed-off-by: Peter

[PATCH v2] completion: expand "push --delete " for refs on that

Change the completion of "push --delete " to complete refs on that , not all refs. Before this cloning git.git and doing "git push --delete origin p" will complete nothing, since a fresh clone of git.git will have no "pu" branch, whereas origin/p will uselessly complete origin/pu, but fully

Re: [PATCH] completion: optionally disable checkout DWIM

On Fri, Apr 21, 2017 at 10:19 PM, Jeff King wrote: > On Fri, Apr 21, 2017 at 10:14:48PM +0200, SZEDER Gábor wrote: > >> >> This is flexible enough for me, but it's possible somebody would want >> >> this on a per-repo basis. I don't know that we want to read from `git >> >>

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Hi Dscho, On Sat, Apr 22, 2017 at 1:48 PM, Johannes Schindelin wrote: >> >> First bisect should ask you to test merge bases only if there are >> "good" commits that are not ancestors of the "bad" commit. > > Please note that this is a stateless job. The only "state" I

Re: [PATCH] Documentation/git-checkout: make doc. of checkout clearer

On Tue, 2017-04-18 at 18:40 -0700, Junio C Hamano wrote: > Christoph Michelbach writes: > > > > > On Mon, 2017-04-17 at 17:31 -0700, Junio C Hamano wrote: > > > > > > > > Obviously, "grab all paths that match out of , > > > add > > > them to the index and copy them

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Am 21.04.2017 um 14:29 schrieb Christian Couder: First bisect should ask you to test merge bases only if there are "good" commits that are not ancestors of the "bad" commit. That's a tangent, but I have never understood why this needs to be so. Consider this: o--o--o--o--o--o--o--o--B

Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

Hi Christian, On Fri, 21 Apr 2017, Christian Couder wrote: > On Fri, Apr 21, 2017 at 11:50 AM, Johannes Schindelin > wrote: > > > > (with all associated problems I reported earlier, as you apply some > > patches on top of really ancient commits and bisect wants to

Re: [PATCH v3 06/12] refs: add refs_head_ref()

On Sat, Apr 22, 2017 at 1:37 PM, Michael Haggerty wrote: > On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> refs.c | 19 +-- >> refs.h | 2 ++ >> 2 files changed, 11 insertions(+), 10

Re: [PATCH v3 00/12] Fix git-gc losing objects in multi worktree

On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: > Changes since v2 [1] is relatively small. It still needs > nd/worktree-kill-parse-ref of course. I read the whole series. Aside from the comments I made, it looks good to me. This will be able to be cleaned up once we have a cleaner

Re: [PATCH v3 10/12] files-backend: make reflog iterator go through per-worktree reflog

On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: > refs/bisect is unfortunately per-worktree, so we need to look in > per-worktree logs/refs/bisect in addition to per-repo logs/refs. The > current iterator only goes through per-repo logs/refs. > > Ideally we should have something like

Re: [PATCH v3 06/12] refs: add refs_head_ref()

On 04/19/2017 01:01 PM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > refs.c | 19 +-- > refs.h | 2 ++ > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/refs.c b/refs.c > index 26474cb62a..a252ae43ee 100644 >