Re: [PATCH] submodule: avoid sentence-lego in translated string

On 9 October 2017 at 03:30, Junio C Hamano wrote: > On Mon, Oct 9, 2017 at 9:51 AM, brian m. carlson > wrote: >> On Sun, Oct 08, 2017 at 10:32:35AM +0100, Philip Oakley wrote: >>> From: "Martin Ågren" >>> > -

Re: [PATCH v3 03/10] protocol: introduce protocol extention mechanisms

On 6 October 2017 at 11:40, Junio C Hamano wrote: > Simon Ruderich writes: > >> Did you consider Stefan Beller's suggestion regarding a >> (white)list of allowed versions? >> >> On Mon, Sep 18, 2017 at 01:06:59PM -0700, Stefan Beller wrote: >>> Thinking

Re: [PATCH] submodule: avoid sentence-lego in translated string

On Mon, Oct 9, 2017 at 9:51 AM, brian m. carlson wrote: > On Sun, Oct 08, 2017 at 10:32:35AM +0100, Philip Oakley wrote: >> From: "Martin Ågren" >> > - die(_("submodule entry '%s' (%s) is a %s, not a commit"), >> > - cb->path,

[PATCH v2 16/24] refs: convert reflog_expire parameter to struct object_id

reflog_expire already used struct object_id internally, but it did not take it as a parameter. Adjust the parameter (and the callers) to pass a pointer to struct object_id instead of a pointer to unsigned char. Remove the temporary inserted earlier as it is no longer required. Signed-off-by:

[PATCH v2 05/24] refs: update ref transactions to use struct object_id

Update the ref transaction code to use struct object_id. Remove one NULL pointer check which was previously inserted around a dereference; since we now pass a pointer to struct object_id directly through, the code we're calling handles this for us. Signed-off-by: brian m. carlson

[PATCH v2 13/24] builtin/pack-objects: convert to struct object_id

This is one of the last unconverted callers to peel_ref. While we're fixing that, convert the rest of the file, since it will need to be converted at some point anyway. Signed-off-by: brian m. carlson --- builtin/pack-objects.c | 135

[PATCH v2 07/24] refs: convert resolve_refdup and refs_resolve_refdup to struct object_id

All of the callers already pass the hash member of struct object_id, so update them to pass a pointer to the struct directly, This transformation was done with an update to declaration and definition and the following semantic patch: @@ expression E1, E2, E3, E4; @@ - resolve_refdup(E1, E2,

[PATCH v2 11/24] refs: convert dwim_log to struct object_id

Signed-off-by: brian m. carlson --- builtin/reflog.c | 4 ++-- reflog-walk.c| 2 +- refs.c | 8 refs.h | 2 +- sha1_name.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/reflog.c

[PATCH v2 14/24] refs: convert peel_ref to struct object_id

Convert peel_ref (and its corresponding backend) to struct object_id. This transformation was done with an update to the declaration, definition, and test helper and the following semantic patch: @@ expression E1, E2; @@ - peel_ref(E1, E2.hash) + peel_ref(E1, ) @@ expression E1, E2; @@ -

[PATCH v2 08/24] refs: convert read_ref and read_ref_full to object_id

All but two of the call sites already had parameters using the hash parameter of struct object_id, so convert them to take a pointer to the struct directly. Also convert refs_read_refs_full, the underlying implementation. Signed-off-by: brian m. carlson ---

[PATCH v2 17/24] sha1_file: convert index_path and index_fd to struct object_id

Convert these two functions and the functions that underlie them to take pointers to struct object_id. This is a prerequisite to convert resolve_gitlink_ref. Fix a stray tab in the middle of the index_mem call in index_pipe by converting it to a space. Signed-off-by: brian m. carlson

[PATCH v2 06/24] Convert check_connected to use struct object_id

Convert check_connected and the callbacks it takes to use struct object_id. Signed-off-by: brian m. carlson --- builtin/clone.c| 4 ++-- builtin/fetch.c| 4 ++-- builtin/receive-pack.c | 10 +- connected.c| 18

[PATCH v2 15/24] refs: convert read_ref_at to struct object_id

Convert the callers and internals, including struct read_ref_at_cb, of read_ref_at to use struct object_id. Signed-off-by: brian m. carlson --- builtin/show-branch.c | 4 ++-- refs.c| 34 +- refs.h|

[PATCH v2 12/24] pack-bitmap: convert traverse_bitmap_commit_list to object_id

Convert traverse_bitmap_commit_list and the callbacks it takes to use a pointer to struct object_id. Signed-off-by: brian m. carlson --- builtin/pack-objects.c | 8 builtin/rev-list.c | 4 ++-- pack-bitmap.c | 8 pack-bitmap.h

[PATCH v2 20/24] worktree: convert struct worktree to object_id

Convert the head_sha1 member to be head_oid instead. This is required to convert resolve_ref_unsafe. Signed-off-by: brian m. carlson --- builtin/worktree.c | 6 +++--- worktree.c | 2 +- worktree.h | 2 +- 3 files changed, 5 insertions(+), 5

[PATCH v2 09/24] refs: convert dwim_ref and expand_ref to struct object_id

All of the callers of these functions just pass the hash member of a struct object_id, so convert them to use a pointer to struct object_id directly. Signed-off-by: brian m. carlson --- archive.c | 2 +- branch.c | 2 +-

[PATCH v2 10/24] builtin/reflog: convert remaining unsigned char uses to object_id

Convert the remaining uses of unsigned char [20] to struct object_id. This conversion is needed for dwim_log. Signed-off-by: brian m. carlson --- builtin/reflog.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git

[PATCH v2 04/24] refs: convert update_ref and refs_update_ref to use struct object_id

Convert update_ref, refs_update_ref, and write_pseudoref to use struct object_id. Update the existing callers as well. Remove update_ref_oid, as it is no longer needed. Signed-off-by: brian m. carlson --- bisect.c | 5 +++-- builtin/am.c

[PATCH v2 24/24] refs/files-backend: convert static functions to object_id

Convert several static functions to take pointers to struct object_id. Change the relevant parameters to write_packed_entry to be const, as we don't modify them. Rename lock_ref_sha1_basic to lock_ref_oid_basic to reflect its new argument. Signed-off-by: brian m. carlson

[PATCH v2 23/24] refs: convert read_raw_ref backends to struct object_id

Convert the unsigned char * parameter to struct object_id * for files_read_raw_ref and packed_read_raw-ref. Update the documentation. Switch from using get_sha1_hex and a hard-coded 40 to using parse_oid_hex. Signed-off-by: brian m. carlson --- refs.c

[PATCH v2 21/24] refs: convert resolve_ref_unsafe to struct object_id

Convert resolve_ref_unsafe to take a pointer to struct object_id by converting one remaining caller to use struct object_id, converting the declaration and definition, and applying the following semantic patch: @@ expression E1, E2, E3, E4; @@ - resolve_ref_unsafe(E1, E2, E3.hash, E4) +

[PATCH v2 18/24] Convert remaining callers of resolve_gitlink_ref to object_id

Signed-off-by: brian m. carlson --- diff-lib.c | 4 ++-- dir.c | 8 read-cache.c | 6 +++--- unpack-trees.c | 8 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index 4e0980caa8..af4f1b7865

[PATCH v2 19/24] refs: convert resolve_gitlink_ref to struct object_id

Convert the declaration and definition of resolve_gitlink_ref to use struct object_id and apply the following semantic patch: @@ expression E1, E2, E3; @@ - resolve_gitlink_ref(E1, E2, E3.hash) + resolve_gitlink_ref(E1, E2, ) @@ expression E1, E2, E3; @@ - resolve_gitlink_ref(E1, E2, E3->hash) +

[PATCH v2 22/24] refs: convert peel_object to struct object_id

Signed-off-by: brian m. carlson --- refs.c| 8 refs/files-backend.c | 2 +- refs/packed-backend.c | 4 ++-- refs/ref-cache.c | 2 +- refs/refs-internal.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git

[PATCH v2 00/24] object_id part 10

This is the tenth in a series of patches to convert from unsigned char [20] to struct object_id. This series mostly involves changes to the refs code. After these changes, there are almost no references to unsigned char in the main refs code. The series has not been rebased on master since the

[PATCH v2 02/24] refs/files-backend: convert struct ref_to_prune to object_id

Change the member of this struct to be a struct object_id. Signed-off-by: brian m. carlson --- refs/files-backend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index fec77744b4..e3968d4f7c

[PATCH v2 03/24] refs: convert delete_ref and refs_delete_ref to struct object_id

Convert delete_ref and refs_delete_ref to take a pointer to struct object_id. Update the documentation accordingly, including referring to null_oid in lowercase, as it is not a #define constant. Signed-off-by: brian m. carlson --- builtin/branch.c | 2 +-

[PATCH v2 01/24] walker: convert to struct object_id

Signed-off-by: brian m. carlson --- walker.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/walker.c b/walker.c index 274f1a4935..2d83254bc0 100644 --- a/walker.c +++ b/walker.c @@ -7,7 +7,7 @@ #include "blob.h"

Re: [PATCH] submodule: avoid sentence-lego in translated string

On Sun, Oct 08, 2017 at 10:32:35AM +0100, Philip Oakley wrote: > From: "Martin Ågren" > > - die(_("submodule entry '%s' (%s) is a %s, not a commit"), > > - cb->path, oid_to_hex(oid), typename(type)); > > + die(_("submodule entry '%s' (%s) is not a commit"), > > +

GOOD DAY

CONTACT US TODAY FOR BUSINESS OR PERSONAL LOAN.

Re: [PATCH v1 2/2] entry.c: check if file exists after checkout

> On 06 Oct 2017, at 06:56, Jeff King wrote: > > On Fri, Oct 06, 2017 at 01:26:48PM +0900, Junio C Hamano wrote: > > ... >> -- >8 -- >> From: Lars Schneider >> Date: Thu, 5 Oct 2017 12:44:07 +0200 >> Subject: [PATCH] entry.c: check if file exists after

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

> On 06 Oct 2017, at 06:54, Jeff King wrote: > > On Fri, Oct 06, 2017 at 08:01:48AM +0900, Junio C Hamano wrote: > >>> But >>> I think we'd want to protect the read_blob_entry() call at the top of >>> the case with a check for dco->state == CE_RETRY. >> >> Yeah, I think that

Re: Special strings in commit messages

Florian Weimer wrote: > Based on strace output, something in git rebase calls git mailsplit, and it > probably sees the "\nFrom " string and treats it as a start of a new mail > message, and things go downhill from there. > > I will escape "\nFrom " in commit messages

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, Oct 08, 2017 at 03:44:14PM -0400, Robert P. J. Day wrote: > > > > find | xargs git rm > > > > myself. > > that's what i would have normally used until i learned about git's > magical globbing capabilities, and i'm going to go back to using it, > because git's magical globbing

$850.000.00 Donation.

David & Maureen picked you for $850.000.00 Donation, Kindly reply for details and claim.

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, 8 Oct 2017, Theodore Ts'o wrote: > On Sun, Oct 08, 2017 at 10:32:40AM -0400, Paul Smith wrote: > > Personally I don't use Git's magical globbing capabilities, and > > use "git rm" as if it were UNIX rm. So in your request above I'd > > use: > > > >git rm $(find . -name Makefile) > >

[PATCH v4 1/4] p4211-line-log.sh: add log --online --raw --parents perf test

Add a new perf test for testing the performance of log while computing OID abbreviations. Using --oneline --raw and --parents options maximizes the number of OIDs to abbreviate while still spending some time computing diffs. Signed-off-by: Derrick Stolee ---

[PATCH v4 4/4] sha1_name: minimize OID comparisons during disambiguation

Minimize OID comparisons during disambiguatiosn of packfile OIDs. Teach git to use binary search with the full OID to find the object's position (or insertion position, if not present) in the pack-index. The object before and immediately after (or the one at the insertion position) give the

[PATCH v4 3/4] sha1_name: parse less while finding common prefix

Create get_hex_char_from_oid() to parse oids one hex character at a time. This prevents unnecessary copying of hex characters in extend_abbrev_len() when finding the length of a common prefix. Signed-off-by: Derrick Stolee --- sha1_name.c | 14 -- 1 file

[PATCH v4 0/4] Improve abbreviation disambiguation

Changes since previous version: * Fixed an overflow error in the binary search. I sent a separate patch to fix this error in existing searches; that patch should be applied before this one. * Removed test-list-objects and test-abbrev in favor of a new git log test in p4211-line-log.sh.

[PATCH v4 2/4] sha1_name: unroll len loop in find_unique_abbrev_r

Unroll the while loop inside find_unique_abbrev_r to avoid iterating through all loose objects and packfiles multiple times when the short name is longer than the predicted length. Instead, inspect each object that collides with the estimated abbreviation to find the longest common prefix. The

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, Oct 08, 2017 at 10:32:40AM -0400, Paul Smith wrote: > Personally I don't use Git's magical globbing capabilities, and use "git > rm" as if it were UNIX rm. So in your request above I'd use: > >git rm $(find . -name Makefile) > > which I find simpler. I have to agree that git's

[PATCH v2] cleanup: fix possible overflow errors in binary search

A common mistake when writing binary search is to allow possible integer overflow by using the simple average: mid = (min + max) / 2; Instead, use the overflow-safe version: mid = min + (max - min) / 2; This translation is safe since the operation occurs inside a loop

Special strings in commit messages

I have a commit which looks like this: $ git cat-file commit 4ca76eb7b47724c2444dfea7890fa8db4edd5762 tree c845be47a0653624b1984d0dc1a0b485b527811d parent 9eee98638ef06149e17f94afaa357e3a9e296e69 author Florian Weimer 1507481682 +0200 committer Florian Weimer

Re: "git rm" seems to do recursive removal even without "-r"

On Sat, 2017-10-07 at 17:55 -0400, Robert P. J. Day wrote: > On Sat, 7 Oct 2017, Paul Smith wrote: > > On Sat, 2017-10-07 at 15:43 -0400, Robert P. J. Day wrote: > > > it's been a long week, so take this in the spirit in which it is > > > intended ... i think the "git rm" command and its man page

Re: [PATCH v3 03/10] protocol: introduce protocol extention mechanisms

On 6 October 2017 at 22:27, Stefan Beller wrote: >> I might be naive in thinking that protocol.version could be removed or >> redefined at our discretion just because it's marked as "experimental". > > Well the redefinition might very well occur, when we now say "set to v1 >

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, 8 Oct 2017, René Scharfe wrote: > [My SMTP server still refuses to accept emails to rpj...@crashcourse.ca > and reports "mailbox unavailable" and "invalid DNS MX or A/ resource > record." So just replying to the list.] > > Am 08.10.2017 um 13:56 schrieb Robert P. J. Day: > >but

Re: "git rm" seems to do recursive removal even without "-r"

[My SMTP server still refuses to accept emails to rpj...@crashcourse.ca and reports "mailbox unavailable" and "invalid DNS MX or A/ resource record." So just replying to the list.] Am 08.10.2017 um 13:56 schrieb Robert P. J. Day: >but as i asked in my earlier post, if i wanted to

Re: "git rm" seems to do recursive removal even without "-r"

On 8 October 2017 at 13:56, Robert P. J. Day wrote: > but as i asked in my earlier post, if i wanted to remove *all* files > with names of "Makefile*", why can't i use: > > $ git rm 'Makefile*' > > just as i used: > > $ git rm '*.c' > > are those not both acceptable

[PATCH] i18n: add a missing space in message

The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. Signed-off-by: Jean-Noel Avila --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) This is a single change discovered while doing the localization

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, 8 Oct 2017, Junio C Hamano wrote: > "Robert P. J. Day" writes: > > > ... so if, in the kernel source > > tree, i ran: > > > > $ git rm \*.c > > > > i would end up removing *all* 25,569 "*.c" files in the kernel > > source repository. > > Yes, as that is exactly

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, Oct 08, 2017 at 05:07:12AM -0400, Robert P. J. Day wrote: > On Sun, 8 Oct 2017, Junio C Hamano wrote: > > > "Robert P. J. Day" writes: > > > > > ... so if, in the kernel source > > > tree, i ran: > > > > > > $ git rm \*.c > > > > > > i would end up removing *all*

Re: [PATCH] submodule: avoid sentence-lego in translated string

On 8 October 2017 at 11:32, Philip Oakley wrote: > From: "Martin Ågren" > >> We currently build an error message like "entry is a %s, not a commit", >> where the placeholder will be replaced with "blob", "tag" or "tree". >> Apart from those three

Re: [PATCH] submodule: avoid sentence-lego in translated string

From: "Martin Ågren" We currently build an error message like "entry is a %s, not a commit", where the placeholder will be replaced with "blob", "tag" or "tree". Apart from those three placeholder words not being translated, in some languages it might be awkward or

Re: "git rm" seems to do recursive removal even without "-r"

On Sun, 8 Oct 2017, Junio C Hamano wrote: > "Robert P. J. Day" writes: > > > ... so if, in the kernel source > > tree, i ran: > > > > $ git rm \*.c > > > > i would end up removing *all* 25,569 "*.c" files in the kernel source > > repository. > > Yes, as that is exactly

[PATCH] submodule: avoid sentence-lego in translated string

We currently build an error message like "entry is a %s, not a commit", where the placeholder will be replaced with "blob", "tag" or "tree". Apart from those three placeholder words not being translated, in some languages it might be awkward or impossible to ensure a grammatically correct end

Re: is there a truly compelling rationale for .git/info/exclude?

> rpj...@crashcourse.ca: > but even that isn't a really compelling reason. so what's it for? I use it to ignore stuff in my git-versioned home directory. Every time I use a new program and it creates a config file or a config directory, it shows up as clutter in magit in my git versioned

[L10N] Kickoff of translation for Git 2.15.0 round 1

Hi, Git v2.15.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 68 updated messages need to be translated since last update. You can get it from the usual place: https://github.com/git-l10n/git-po/ As how to update your XX.po and help to translate