What's cooking in git.git (May 2017, #01; Mon, 1)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. 2.13-rc1 was tagged and we are

Re: [PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions.

On Mon, May 01, 2017 at 01:17:58AM -0400, Jeff King wrote: > Yeah, I agree it is an existing bug. The only other case I found is > dirstat. Doing: > > mkdir a b > for i in 1 2; do echo content >a/$i; done > for i in 1 2 3; do echo content >b/$i; done > git -c diff.dirstat=50 diff-tree

Re: [PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions.

On Sun, Apr 30, 2017 at 06:01:37PM -0700, Junio C Hamano wrote: > >> + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ > >>init_revisions(, prefix); > >>gitmodules_config(); > >> - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ > >>rev.abbrev

Re: [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic.

On Sun, Apr 30, 2017 at 06:11:48PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > diff --git a/t/t4051-diff-function-context.sh > > b/t/t4051-diff-function-context.sh > > index 6154acb45..5f46c0341 100755 > > --- a/t/t4051-diff-function-context.sh > > +++

Re: [PATCH/RFC 1/1] t0027: Some tests are not expensive

On 01/05/17 05:07, Junio C Hamano wrote: tbo...@web.de writes: From: Torsten Bögershausen ... The execution time for the non-expansive part is 6..8 seconds under Linux, and 32 seconds under Mac Os X. Running the "expensive" version roughly doubles the time. Hmph, perhaps

Re: Proposal for missing blob support in Git repos

Jonathan Tan writes: > In order to determine the code changes in sha1_file.c necessary, I > investigated the following: > (1) functions in sha1_file that take in a hash, without the user > regarding how the object is stored (loose or packed) > (2) functions in

Re: [PATCH 5/6] submodule: improve submodule_has_commits

Brandon Williams writes: > oid_array_for_each_unique(commits, check_has_commit, _commit); > + > + if (has_commit) { > + /* > + * Even if the submodule is checked out and the commit is > + * present, make sure it is reachable from

Re: [PATCH 4/6] submodule: change string_list changed_submodule_paths

Brandon Williams writes: > Eliminate a call to 'xstrdup()' by changing the string_list > 'changed_submodule_paths' to duplicated strings added to it. > > Signed-off-by: Brandon Williams > --- > submodule.c | 4 ++-- > 1 file changed, 2 insertions(+), 2

Re: [PATCH 1/6] submodule: rename add_sha1_to_array

Brandon Williams writes: > Rename 'add_sha1_to_array()' to 'append_oid_to_array()' to more > accuratly describe what the function does since it handles 'struct accurately. Will fix while queuing. Makes sense. Thanks. > object_id' and not sha1 character arrays. > >

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

Chris Johnson writes: > Also, and sorry for the noise, but I did a reply-all here, but will a > reply automatically include the rest of the list? Or was reply-all the > right move? The convention around here is to do reply-all (in other words, make sure that Cc: line

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Johannes Schindelin writes: > In that case, I would strongly advise to consider redesigning the API. The API we currently have and is used by "log", "rev-list" and friends is to have setup_revisions() parse the av[], i.e. the textual API, and it is sufficient to hide

Re: [PATCH/RFC 1/1] t0027: Some tests are not expensive

tbo...@web.de writes: > From: Torsten Bögershausen > ... > The execution time for the non-expansive part is 6..8 seconds under Linux, > and 32 seconds under Mac Os X. > > Running the "expensive" version roughly doubles the time. Hmph, perhaps none of these is truly expensive if

[PATCH v2 53/53] object: convert parse_object* to take struct object_id

Make parse_object, parse_object_or_die, and parse_object_buffer take a pointer to struct object_id. Remove the temporary variables inserted earlier, since they are no longer necessary. Transform all of the callers using the following semantic patch: @@ expression E1; @@ - parse_object(E1.hash)

[PATCH v2 48/53] merge: convert checkout_fast_forward to struct object_id

Converting checkout_fast_forward is required to convert parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/merge.c | 4 ++-- builtin/pull.c | 4 ++-- cache.h | 4 ++-- merge.c | 8 sequencer.c | 2 +- 5 files changed, 11

[PATCH v2 51/53] sequencer: convert do_recursive_merge to struct object_id

This conversion is required to convert parse_tree_indirect. Signed-off-by: brian m. carlson --- sequencer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sequencer.c b/sequencer.c index b295004af..d2963c6c5 100644 --- a/sequencer.c +++

[PATCH v2 46/53] builtin/ls-files: convert overlay_tree_on_cache to object_id

This is another caller of parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/ls-files.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a6c70dbe9..da0ff849f 100644 ---

[PATCH v2 44/53] sha1_name: convert internals of peel_onion to object_id

Signed-off-by: brian m. carlson --- sha1_name.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index b7e09ac13..72e72ab9a 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -798,7 +798,7 @@ struct object

[PATCH v2 52/53] tree: convert parse_tree_indirect to struct object_id

Convert parse_tree_indirect to take a pointer to struct object_id. Update all the callers. This transformation was achieved using the following semantic patch and manual updates to the declaration and definition. Update builtin/checkout.c manually as well, since it uses a ternary expression not

[PATCH v2 50/53] diff-lib: convert do_diff_cache to struct object_id

This is needed to convert parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/am.c| 2 +- builtin/blame.c | 6 +++--- builtin/reset.c | 2 +- diff-lib.c | 12 ++-- diff.h | 2 +- 5 files changed, 12 insertions(+), 12

[PATCH v2 45/53] builtin/read-tree: convert to struct object_id

This is a caller of parse_tree_indirect, which must be converted in order to convert parse_object. Signed-off-by: brian m. carlson --- builtin/read-tree.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/read-tree.c

[PATCH v2 34/53] Convert lookup_tag to struct object_id

Convert lookup_tag to take a pointer to struct object_id. Signed-off-by: brian m. carlson --- builtin/describe.c | 6 +++--- builtin/pack-objects.c | 2 +- builtin/replace.c | 2 +- log-tree.c | 2 +- object.c | 2 +- sha1_name.c

[PATCH v2 49/53] builtin/ls-tree: convert to struct object_id

This is a prerequisite to convert do_diff_cache, which is required to convert parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/ls-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c

[PATCH v2 31/53] builtin/reflog: convert tree_is_complete to take struct object_id

Signed-off-by: brian m. carlson --- builtin/reflog.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 4831116ea..7866a0341 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -55,14 +55,14

[PATCH v2 47/53] sequencer: convert fast_forward_to to struct object_id

fast_forward_to is required for checkout_fast_fowrard, which is required for parse_tree_indirect. Signed-off-by: brian m. carlson --- sequencer.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sequencer.c b/sequencer.c

[PATCH v2 43/53] upload-pack: convert remaining parse_object callers to object_id

Convert the remaining parse_object callers to struct object_id. Use named constants for several hard-coded values. In addition, rename got_sha1 to got_oid to reflect the new argument. Signed-off-by: brian m. carlson --- upload-pack.c | 50

[PATCH v2 41/53] revision: rename add_pending_sha1 to add_pending_oid

Rename this function and convert it to take a pointer to struct object_id. This is a prerequisite for converting get_reference, which is needed to convert parse_object. Signed-off-by: brian m. carlson --- builtin/am.c | 2 +- builtin/checkout.c | 4 ++--

[PATCH v2 32/53] Convert lookup_tree to struct object_id

Convert the lookup_tree function to take a pointer to struct object_id. The commit was created with manual changes to tree.c, tree.h, and object.c, plus the following semantic patch: @@ @@ - lookup_tree(EMPTY_TREE_SHA1_BIN) + lookup_tree(_tree_oid) @@ expression E1; @@ - lookup_tree(E1.hash) +

[PATCH v2 26/53] pack: convert struct pack_idx_entry to struct object_id

Convert struct pack_idx_entry to use struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct pack_idx_entry E1; @@ - E1.sha1 + E1.oid.hash @@ struct pack_idx_entry *E1; @@ - E1->sha1 + E1->oid.hash Signed-off-by:

[PATCH v2 18/53] http-push: convert some static functions to struct object_id

Among the functions converted is a caller of lookup_commit_or_die, which we will convert later on. Signed-off-by: brian m. carlson --- http-push.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/http-push.c

[PATCH v2 35/53] Convert the verify_pack callback to struct object_id

Make the verify_pack_callback take a pointer to struct object_id. Change the pack checksum to use GIT_MAX_RAWSZ, even though it is not strictly an object ID. Doing so ensures resilience against future hash size changes, and allows us to remove hard-coded assumptions about how big the buffer needs

[PATCH v2 42/53] revision: convert remaining parse_object callers to object_id

Signed-off-by: brian m. carlson --- revision.c | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/revision.c b/revision.c index f82c56e1f..80f74bb7b 100644 --- a/revision.c +++ b/revision.c @@ -177,23

[PATCH v2 23/53] builtin/tag: convert to struct object_id

Parts of this module call lookup_commit_reference, which we want to convert. The module is small and mostly self-contained, so convert the rest of it while we're at it. Signed-off-by: brian m. carlson --- builtin/tag.c | 66

[PATCH v2 20/53] revision: convert prepare_show_merge to struct object_id

This is a caller of lookup_commit_or_die, which we will convert later on. Signed-off-by: brian m. carlson --- revision.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/revision.c b/revision.c index 2b56c3baf..945367034 100644 ---

[PATCH v2 39/53] refs/files-backend: convert many internals to struct object_id

Convert many of the internals of the files backend to use struct object_id. Avoid converting public APIs (except one change to refs/ref-cache.c) to limit the scope of the changes. Convert one use of get_sha1_hex to parse_oid_hex, and rely on the fact that a strbuf will be NUL-terminated and that

[PATCH v2 38/53] refs: convert struct ref_update to use struct object_id

Convert struct ref_array_item to use struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct ref_update E1; @@ - E1.new_sha1 + E1.new_oid.hash @@ struct ref_update *E1; @@ - E1->new_sha1 + E1->new_oid.hash @@

[PATCH v2 25/53] Convert lookup_commit* to struct object_id

Convert lookup_commit, lookup_commit_or_die, lookup_commit_reference, and lookup_commit_reference_gently to take struct object_id arguments. Introduce a temporary in parse_object buffer in order to convert this function. This is required since in order to convert parse_object and

[PATCH v2 22/53] sequencer: convert some functions to struct object_id

Convert update_squash_messages and is_index_unchanged to struct object_id. These are callers of lookup_commit and lookup_commit_reference, which we want to convert. Signed-off-by: brian m. carlson --- sequencer.c | 12 ++-- 1 file changed, 6 insertions(+),

[PATCH v2 17/53] tag: convert parse_tag_buffer to struct object_id

Specify some constants in terms of GIT_SHA1_HEXSZ, and convert a get_sha1_hex into parse_oid_hex to avoid needing to specify additional constants. Signed-off-by: brian m. carlson --- tag.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff

[PATCH v2 24/53] Convert remaining callers of lookup_commit_reference* to object_id

There are a small number of remaining callers of lookup_commit_reference and lookup_commit_reference_gently that still need to be converted to struct object_id. Convert these. Signed-off-by: brian m. carlson --- notes-merge.c | 26 +-

[PATCH v2 30/53] tree: convert read_tree_1 to use struct object_id internally

Signed-off-by: brian m. carlson --- tree.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tree.c b/tree.c index 33fa7ee71..21fd80b80 100644 --- a/tree.c +++ b/tree.c @@ -58,7 +58,7 @@ static int read_tree_1(struct tree *tree, struct

[PATCH v2 28/53] Convert remaining callers of lookup_blob to object_id

All but a few callers of lookup_blob have been converted to struct object_id. Introduce a temporary, which will be removed later, into parse_object to ease the transition, and convert the remaining callers so that we can update lookup_blob to take struct object_id *. Signed-off-by: brian m.

[PATCH v2 36/53] Convert struct ref_array_item to struct object_id

Convert struct ref_array_item to use struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct ref_array_item E1; @@ - E1.objectname + E1.objectname.hash @@ struct ref_array_item *E1; @@ - E1->objectname +

[PATCH v2 21/53] shallow: convert shallow registration functions to object_id

Convert register_shallow and unregister_shallow to take struct object_id. register_shallow is a caller of lookup_commit, which we will convert later. It doesn't make sense for the registration and unregistration functions to have incompatible interfaces, so convert them both. Signed-off-by:

[PATCH v2 27/53] builtin/unpack-objects: convert to struct object_id

Convert struct delta_info and struct object_info, as well as the various functions, to use struct object_id. Convert several hard-coded 20 values to GIT_SHA1_RAWSZ. Among the functions converted is a caller of lookup_blob, which we will convert shortly. Signed-off-by: brian m. carlson

[PATCH v2 33/53] log-tree: convert to struct object_id

Convert the remaining functions to take pointers to struct object_id instead of pointers to unsigned char, and update the internals of these functions as well. Among these functions is a caller of lookup_tag, which we will convert shortly. Signed-off-by: brian m. carlson

[PATCH v2 29/53] Convert lookup_blob to struct object_id

Convert lookup_blob to take a pointer to struct object_id. The commit was created with manual changes to blob.c and blob.h, plus the following semantic patch: @@ expression E1; @@ - lookup_blob(E1.hash) + lookup_blob() @@ expression E1; @@ - lookup_blob(E1->hash) + lookup_blob(E1)

[PATCH v2 37/53] ref-filter: convert some static functions to struct object_id

Among the converted functions is a caller of parse_object_buffer, which we will convert later. Signed-off-by: brian m. carlson --- ref-filter.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ref-filter.c b/ref-filter.c

[PATCH v2 40/53] http-push: convert process_ls_object and descendants to object_id

Rename one function to reflect that it now uses struct object_id. This conversion is a prerequisite for converting parse_object. Note that while the use of a buffer that is exactly forty bytes long looks questionable, get_oid_hex reads exactly the right number of bytes and does not require the

[PATCH v2 19/53] notes-utils: convert internals to struct object_id

Convert the internals of create_notes_comit and commit_notes to use struct object_id. Signed-off-by: brian m. carlson --- notes-utils.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/notes-utils.c b/notes-utils.c index

[PATCH v2 14/53] parse-options-cb: convert to struct object_id

This is a caller of lookup_commit_reference, which we will soon convert. Signed-off-by: brian m. carlson --- parse-options-cb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parse-options-cb.c b/parse-options-cb.c index

[PATCH v2 09/53] builtin/rev-parse: convert to struct object_id

Some of the functions converted are callers of lookup_commit_reference. However, the changes involved in converting the entire thing are not too large, so we might as well convert it all. Signed-off-by: brian m. carlson --- builtin/rev-parse.c | 56

[PATCH v2 06/53] bundle: convert to struct object_id

Convert the bundle code, plus the sole external user of struct ref_list_entry, to use struct object_id. Include cache.h from within bundle.h to provide the definition. Convert some of the hash parsing code to use parse_oid_hex to avoid needing to hard-code constant values. Signed-off-by: brian

[PATCH v2 16/53] builtin/verify-commit: convert to struct object_id

This is a prerequisite to convert to lookup_commit, which we will convert later. Signed-off-by: brian m. carlson --- builtin/verify-commit.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/verify-commit.c

[PATCH v2 15/53] reflog_expire: convert to struct object_id

Adjust the callback functions to take struct object_id * instead of unsigned char *, and modify related static functions accordingly. Introduce a temporary object_id instance into files_reflog_expire and copy the SHA-1 value passed in. This is necessary because the sha1 parameter can come

[PATCH v2 11/53] fast-import: convert to struct object_id

Convert the remaining parts of fast-import.c to use struct object_id. Convert several instances of get_sha1_hex to parse_oid_hex to avoid needing to specify constants. Convert other hardcoded values to named constants. Finally, use the is_empty_tree_oid function instead of a direct comparison

[PATCH v2 13/53] notes-cache: convert to struct object_id

Convert as many instances of unsigned char [20] as possible. Update the callers of notes_cache_get and notes_cache_put to use the new interface. Among the functions updated are callers of lookup_commit_reference_gently, which we will soon convert. Signed-off-by: brian m. carlson

[PATCH v2 07/53] branch: convert to struct object_id

This change is required to convert lookup_commit_reference later. Signed-off-by: brian m. carlson --- branch.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/branch.c b/branch.c index ad5a2299b..1758c9708 100644 --- a/branch.c

[PATCH v2 08/53] builtin/blame: convert static function to struct object_id

This function is a caller of lookup_commit_reference_gently, which we will convert later. Signed-off-by: brian m. carlson --- builtin/blame.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index

[PATCH v2 12/53] submodule: convert merge_submodule to use struct object_id

This is a caller of lookup_commit_reference, which we will convert later. Signed-off-by: brian m. carlson --- merge-recursive.c | 8 submodule.c | 24 submodule.h | 8 3 files changed, 20 insertions(+), 20

[PATCH v2 10/53] fast-import: convert internal structs to struct object_id

Convert struct tree_entry_ms, struct branch, struct tag, and struct hash_list to use struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct tree_entry_ms E1; @@ - E1.sha1 + E1.oid.hash @@ struct tree_entry_ms *E1;

[PATCH v2 04/53] builtin/name-rev: convert to struct object_id

Convert all the uses of unsigned char [20] to struct object_id. Also, convert some hard-coded integers into constants. name_rev_line accepts a wide variety of free-form input and only interprets 40-character hex values, passing through everything else. Consequently, it is not a good candidate

[PATCH v2 05/53] builtin/prune: convert to struct object_id

Convert the sole instance of unsigned char [20] to struct object_id. cmd_prune is a caller of parse_object, which we will convert later. Signed-off-by: brian m. carlson --- builtin/prune.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH v2 03/53] Convert struct cache_tree to use struct object_id

Convert the sha1 member of struct cache_tree to struct object_id by changing the definition and applying the following semantic patch, plus the standard object_id transforms: @@ struct cache_tree E1; @@ - E1.sha1 + E1.oid.hash @@ struct cache_tree *E1; @@ - E1->sha1 + E1->oid.hash Fix up one

[PATCH v2 00/53] object_id part 8

This is the eighth series of patches to convert unsigned char [20] to struct object_id. This series converts lookup_commit, lookup_blob, lookup_tree, lookup_tag, and finally parse_object to struct object_id. A small number of functions have temporaries inserted during the conversion in order to

[PATCH v2 02/53] Clean up outstanding object_id transforms.

The semantic patch for standard object_id transforms found two outstanding places where we could make a transformation automatically. Apply these changes. Signed-off-by: brian m. carlson --- builtin/diff.c | 2 +- reflog-walk.c | 2 +- 2 files changed, 2

[PATCH v2 01/53] fetch-pack: convert to struct object_id

Convert all uses of unsigned char [20] to struct object_id. Switch one use of get_sha1_hex to parse_oid_hex to avoid the need for a constant. This change is necessary in order to convert parse_object. Signed-off-by: brian m. carlson --- fetch-pack.c | 89

Re: [PATCH v2] t7400: add !CYGWIN prerequisite to 'add with \\ in path'

Ramsay Jones writes: > Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule > names", 07-04-2017) added a test which creates a git repository with > some backslash characters in the name. On windows, where the backslash > character is a directory

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

Good assessment/understanding of the issue. git clean -n does not report anything as being targeted for removal, and git clean -f matches that behavior. I agree with it probably being related specifically to the -d flag. As another experiment I modified .gitignore to ignore /A/B/C instead of

Re: [PATCH] send-email: new option to walkaround email server limits

xiaoqiang zhao writes: > Some email server(e.g. smtp.163.com) limits a fixed number emails to be send > per > session(connection) and this will lead to a send faliure. That sounds painful. > With --split option, a auto reconnection will occur when number of > sended >

Re: Bug: Git rename does not work if folder naming was changed from lower to upper case on OSX

Kevin Daudt writes: > Note that git does not store that files are renamed. So a remove + add > is the same as a rename in git. Only git status shows it when you for > example use git mv directly, but this information is lost on commit. Are you sure about the last sentence? I do

Re: [PATCH] i18n: remove i18n from tag reflog message

Jean-Noel Avila writes: > The building of the reflog message is using strbuf, which is not > friendly with internationalization frameworks. No other reflog > messages are translated right now and switching all the messages to > i18n would require a major rework of the way the

Re: [PATCH 0/6] changed submodules

Brandon Williams writes: > A little bit ago I was looking for a function in our code base which would be > able to give me a list of all the submodules which changed across a number of > commits. I stumbled upon some of that logic in both our recurisve fetch and > pull code

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

Chris Johnson writes: > I am a mailing list noob so I’m sorry if this is the wrong format or > the wrong please. > > Here’s the setup for the bug (I will call it a bug but I half expect > somebody to tell me I’m an idiot): > > git init > echo "/A/B/" > .gitignore You

Re: [PATCH v3 0/5] clone: --no-tags option

Ævar Arnfjörð Bjarmason writes: > Junio, can you please just take patch 1-3 in this series, i.e.: Given that the old one has been already sitting in 'next' since April 23rd, I'd have to revert it and requeue them anew. Which is possible but cumbersome,... Let me take a look

Re: [PATCH 07/26] http-backend: avoid memory leaks

Johannes Schindelin writes: >> Hmph. I find a "leak" of a resource acquired inside the main >> function and not released when the main function leaves a lot less >> interesting than the other ones this series covers. > > Ah, I missed that this falls squarely into the

Re: [PATCHv2 0/3] Make diff plumbing commands respect the indentHeuristic.

Jeff King writes: > diff --git a/t/t4051-diff-function-context.sh > b/t/t4051-diff-function-context.sh > index 6154acb45..5f46c0341 100755 > --- a/t/t4051-diff-function-context.sh > +++ b/t/t4051-diff-function-context.sh > @@ -72,7 +72,7 @@ test_expect_success 'setup' ' > >

Re: [PATCH 2/2] Have the diff-* builtins configure diff before initializing revisions.

Jeff King writes: > On Thu, Apr 27, 2017 at 04:50:37PM -0400, Marc Branchaud wrote: > >> Subject: [PATCH 2/2] Have the diff-* builtins configure diff before >> initializing revisions. >> >> This makes the commands respect diff configuration options, such as >> indentHeuristic. >>

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Phillip Wood writes: > This changes the behaviour of > git -c rebase.instructionFormat= rebase -i > The shell version treats the rebase.instructionFormat being unset or set > to the empty string as equivalent. This version generates a todo list > with lines like 'pick

Re: Submodule/contents conflict

Jeff King writes: > Interestingly, I would have thought that the first update-index call > would "de-racify" the entry by rewriting the index. But we don't > actually write, presumably because we eventually realize that there are > no entries to update. But it might actually be

Re: [PATCH] doc: update SubmittingPatches

René Genz writes: > -use US English spelling > -minor wording change for better readability > > Helped-by: Stefan Beller > Signed-off-by: René Genz > --- Thanks, will apply. > Documentation/SubmittingPatches | 12

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

René Scharfe writes: > Am 30.04.2017 um 18:32 schrieb Johannes Sixt: >> Am 30.04.2017 um 09:53 schrieb René Scharfe: >>> @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip >>> archive bigger than 4GB' ' >>> "$GIT_UNZIP" -t many-big.zip >>> ' >>> >>>

Re: [PATCH 5/6] submodule: improve submodule_has_commits

On 04/28, Stefan Beller wrote: > On Fri, Apr 28, 2017 at 4:54 PM, Brandon Williams wrote: > > Teach 'submodule_has_commits()' to ensure that if a commit exists in a > > submodule, that it is also reachable from a ref. > > > > This is a prepritory step prior to merging the logic

[PATCH v2 2/2] i18n: read-cache: Fix typo

From: Peter Krefting Signed-off-by: Peter Krefting Signed-off-by: Jean-Noel Avila --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index b3d0f3c30..0d0081a11

[PATCH v2] i18n patches to apply for rc2

Please apply the following patches for rc2 so that the localization can be applied on a cleaned up pot file.

[PATCH v2 1/2] i18n: remove i18n from tag reflog message

The building of the reflog message is using strbuf, which is not friendly with internationalization frameworks. No other reflog messages are translated right now and switching all the messages to i18n would require a major rework of the way the messages are built. Signed-off-by: Jean-Noel Avila

[PATCH v2] l10n: de.po: update German translation

Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow --- :/ It turned out de.po was not up-to-date with the git.pot update mentioned. So here we go again. po/de.po | 323

[PATCH] l10n: de.po: update German translation

Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 309 +++ 1 file changed, 134 insertions(+), 175

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

On 29/04/17 11:44, Johannes Schindelin wrote: > On Sat, 29 Apr 2017, Johannes Sixt wrote: >> Am 29.04.2017 um 02:15 schrieb Ramsay Jones: >>> On 28/04/17 20:54, Johannes Sixt wrote: Am 28.04.2017 um 05:09 schrieb Junio C Hamano: > Ramsay Jones writes: >>

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

On 29/04/17 07:46, Johannes Sixt wrote: > Am 29.04.2017 um 02:15 schrieb Ramsay Jones: >> On 28/04/17 20:54, Johannes Sixt wrote: >>> Am 28.04.2017 um 05:09 schrieb Junio C Hamano: Ramsay Jones writes: >>> t7400.20 does not fail for the MinGW port because the

[PATCH v2] t7400: add !CYGWIN prerequisite to 'add with \\ in path'

Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule names", 07-04-2017) added a test which creates a git repository with some backslash characters in the name. On windows, where the backslash character is a directory separator, it is not possible to create a repository with

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

Am 30.04.2017 um 18:32 schrieb Johannes Sixt: Am 30.04.2017 um 09:53 schrieb René Scharfe: @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' "$GIT_UNZIP" -t many-big.zip ' -test_expect_success EXPENSIVE,UNZIP,ZIPINFO 'zip archive with files bigger

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

Am 30.04.2017 um 09:53 schrieb René Scharfe: @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' "$GIT_UNZIP" -t many-big.zip ' -test_expect_success EXPENSIVE,UNZIP,ZIPINFO 'zip archive with files bigger than 4GB' ' +test_expect_success

[PATCH v2] fix minor typing mistakes

Helped-by: Stefan Beller Signed-off-by: René Genz --- Documentation/git-commit.txt| 4 ++-- Documentation/gitremote-helpers.txt | 2 +- ci/run-windows-build.sh | 2 +- diff.c | 2 +- 4 files changed, 5

[PATCH] doc: update SubmittingPatches

-use US English spelling -minor wording change for better readability Helped-by: Stefan Beller Signed-off-by: René Genz --- Documentation/SubmittingPatches | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[PATCH v2] doc: git-pull.txt use US spelling, fix minor typo

Signed-off-by: René Genz --- Documentation/git-pull.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 4470e4b..942af8e 100644 --- a/Documentation/git-pull.txt +++

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

On 2017-04-30 09:53, René Scharfe wrote: > Am 30.04.2017 um 07:31 schrieb Torsten Bögershausen: >> Sorry, I was not looking careful enough, the macro `$GIT_UNZIP` >> gave the impression that an unzip provided by Git (or the Git test >> framework) was used :-( >> >> $ which unzip >> /usr/bin/unzip

Re: [PATCH/RFC V2] stash: implement builtin stash

Hi Peff & Joel, On Tue, 21 Mar 2017, Jeff King wrote: > On Mon, Mar 13, 2017 at 03:23:18PM -0700, Joel Teichroeb wrote: > > > I've been working on rewriting git stash as a c builtin and I have all > > but three tests passing. I'm having a bit of trouble fixing them, as > > well as a few other

Re: Bug: wrong documentation for git-fast-import's option command

On Apr 30 2017, Tomi Belan wrote: > The man page of git-fast-import says the syntax is "'option' SP > LF". But this is wrong, and commands like that will be > silently ignored. Unless starts with 'git', as you have seen. Other importers may recognize other options, eg

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

Am 30.04.2017 um 07:31 schrieb Torsten Bögershausen: > Sorry, I was not looking careful enough, the macro `$GIT_UNZIP` > gave the impression that an unzip provided by Git (or the Git test > framework) was used :-( > > $ which unzip > /usr/bin/unzip > > $ unzip -v > UnZip 5.52 of 28 February