Re: [PATCH v3 0/6] rebase -i: add config to abbreviate command-names

Hi Johannes, On Tue, 2017-05-02 at 17:48 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Tue, 2 May 2017, Liam Beguin wrote: > > > Add the 'rebase.abbreviateCommands' configuration option to allow `git > > rebase -i` to default to the single-letter command-names in the todo > > list. > >

Re: [PATCH v3 3/6] rebase -i: add short command-name in --autosquash

Hi Johannes, On Tue, 2017-05-02 at 17:34 +0200, Johannes Schindelin wrote: > Hi Liam, > > On Tue, 2 May 2017, Liam Beguin wrote: > > > teach `git rebase -i` to recognise short command-names when using the > > '--autosquash' option. This allows commit with titles beginning with > > "s! ..." and

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On Tue, May 2, 2017 at 8:35 AM, Jeff Hostetler wrote: > You may also want to look at unpack-trees.c : mark_new_skip_worktree(). > It has a local variable named "the_index" in the argument list. > You may want to rename this to avoid confusion. Thanks for bringing this up.

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On 05/02, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 2, 2017 at 2:09 PM, Johannes Schindelin > wrote: > > Hi Ævar, > > > > On Sun, 30 Apr 2017, Junio C Hamano wrote: > > > >> * ab/grep-pcre-v2 (2017-04-25) 20 commits > >> - SQUASH??? > >> - Makefile & configure:

Re: [PATCHv2 0/3] Some submodule bugfixes

On 05/02, Stefan Beller wrote: > v2: > * I dropped the RFC patches for reattaching HEAD as that is not the main >concern of this series. > * patch1 is just about dropping cp1 to reusing cp, instead of additionally >"fixing" mem leaks as finish_command does that for us > * reordered the

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

On Tue, May 2, 2017 at 10:25 AM, Brandon Williams wrote: > On 05/01, Stefan Beller wrote: >> On Mon, May 1, 2017 at 6:02 PM, Brandon Williams wrote: >> > + >> > + if (capture_command(, , GIT_MAX_HEXSZ + 1) || >> > out.len) >> >> eh, I gave too

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

On 05/02, Stefan Beller wrote: > On Tue, May 2, 2017 at 10:25 AM, Brandon Williams wrote: > > On 05/01, Stefan Beller wrote: > >> On Mon, May 1, 2017 at 6:02 PM, Brandon Williams wrote: > >> > + > >> > + if (capture_command(, , GIT_MAX_HEXSZ +

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

On 05/01, brian m. carlson wrote: > 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

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

On 05/01, Stefan Beller wrote: > On Mon, May 1, 2017 at 6:02 PM, Brandon Williams wrote: > > + > > + if (capture_command(, , GIT_MAX_HEXSZ + 1) || > > out.len) > > eh, I gave too much and self-contradicting feedback here earlier, > ideally I'd like to review

CYGWIN git cannot install python packages with pip

On Windows, with Cygwin-git 02.12.2-1 the python command: pip install git+https://github.com/...` fails to work with the following error: $ pip install git+https://github.com/ipython/traitlets/ Collecting git+https://github.com/ipython/traitlets/ Cloning

Re: CYGWIN git cannot install python packages with pip

Note that MSYS2 Git-12.2.1 also has no such problem. On 2 May 2017 at 20:08, ankostis wrote: > On Windows, with Cygwin-git 02.12.2-1 the python command: > > pip install git+https://github.com/...` > > fails to work with the following error: > > ... > > Git-2.8.3 had no

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

On 05/01, brian m. carlson wrote: > 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 +- >

Re: [PATCH v3 14/25] setup_discovered_git_dir(): plug memory leak

On Tue, May 02, 2017 at 10:20:29AM -0700, Stefan Beller wrote: > > - gitdir = real_pathdup(gitdir, 1); > > + gitdir = to_free = real_pathdup(gitdir, 1); > > if (chdir(cwd->buf)) > > die_errno("Could not come back

Re: Proposal for missing blob support in Git repos

On Tue, May 2, 2017 at 7:21 PM, Jonathan Tan wrote: > On Mon, May 1, 2017 at 6:41 PM, Junio C Hamano wrote: >> Jonathan Tan writes: >> >>> On 05/01/2017 04:29 PM, Junio C Hamano wrote: Jonathan Tan

[PATCHv2 2/3] submodule: avoid auto-discovery in new working tree manipulator code

All commands that are run in a submodule, are run in a correct setup, there is no need to prepare the environment without setting the GIT_DIR variable. By setting the GIT_DIR variable we fix issues as discussed in 10f5c52656 (submodule: avoid auto-discovery in prepare_submodule_repo_env(),

[PATCHv2 3/3] submodule: properly recurse for read-tree and checkout

We forgot to prepare the submodule env, which is only a problem for nested submodules. See 2e5d6503bd (ls-files: fix recurse-submodules with nested submodules, 2017-04-13) for further explanation. To come up with a proper test for this, we'd need to look at nested submodules just as in that given

[PATCHv2 1/3] submodule_move_head: reuse child_process structure for futher commands

We do not need to declare another struct child_process, but we can just reuse the existing `cp` struct. Signed-off-by: Stefan Beller --- submodule.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/submodule.c b/submodule.c index

[PATCHv2 0/3] Some submodule bugfixes

v2: * I dropped the RFC patches for reattaching HEAD as that is not the main concern of this series. * patch1 is just about dropping cp1 to reusing cp, instead of additionally "fixing" mem leaks as finish_command does that for us * reordered the patches, former patch 3 now as patch 2

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 2, 2017 at 7:43 PM, Brandon Williams wrote: > On 05/02, Ævar Arnfjörð Bjarmason wrote: >> On Tue, May 2, 2017 at 2:09 PM, Johannes Schindelin >> wrote: >> > Hi Ævar, >> > >> > On Sun, 30 Apr 2017, Junio C Hamano wrote: >> > >> >> *

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 2, 2017 at 6:05 PM, Johannes Schindelin wrote: > Hi Ævar, > > On Tue, 2 May 2017, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, May 2, 2017 at 2:09 PM, Johannes Schindelin >> wrote: >> > >> > On Sun, 30 Apr 2017, Junio C Hamano

Re: [PATCH v3 14/25] setup_discovered_git_dir(): plug memory leak

On Tue, May 2, 2017 at 9:02 AM, Johannes Schindelin wrote: > The setup_explicit_git_dir() function does not take custody of the string > passed as first parameter; we have to release it if we turned the value of > git_dir into an absolute path. > > Signed-off-by:

Re: [PATCH v2 00/53] object_id part 8

On 05/01, brian m. carlson wrote: > 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

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

On 05/02, Brandon Williams wrote: > On 05/02, Stefan Beller wrote: > > On Tue, May 2, 2017 at 10:25 AM, Brandon Williams wrote: > > > On 05/01, Stefan Beller wrote: > > >> On Mon, May 1, 2017 at 6:02 PM, Brandon Williams > > >> wrote: > > >> > + > > >> > +

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

On Tue, May 2, 2017 at 1:21 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >>> * ab/grep-pcre-v2 (2017-04-25) 20 commits >>> - SQUASH??? >>> - Makefile & configure: make PCRE v2 the default PCRE implementation >>> - grep: remove support for

Reference help

Sorry if this is not the place for this. I'm looking for any reference to potential problems when updating a git client (say from 1.7.N to 1.8.N) with old workspaces. The scenario is this: Lots of developers use a single machine for work They have lots of workspaces created

Re: Reference help

On Tue, May 2, 2017 at 9:33 PM, Desjardin, Donald wrote: > Sorry if this is not the place for this. > > I'm looking for any reference to potential problems when updating a git > client (say from 1.7.N to 1.8.N) with old workspaces. > > The scenario is this: >

Re: Proposal for missing blob support in Git repos

On 05/02/2017 11:32 AM, Ævar Arnfjörð Bjarmason wrote: On Tue, May 2, 2017 at 7:21 PM, Jonathan Tan wrote: On Mon, May 1, 2017 at 6:41 PM, Junio C Hamano wrote: Jonathan Tan writes: On 05/01/2017 04:29 PM, Junio C

Re: [PATCH 0/5] Abide by our own rules regarding line endings

Hi, Johannes Schindelin wrote: > Over the past decade, there have been a couple of attempts to remedy the [...] I'm intentionally skimming this cover letter, since anything important it says needs to also be in the commit messages. [...] > Without these fixes, Git will fail to build and pass

[PATCH 04/24] cache.h: drop read_cache_preload(pathspec)

coccinelle patch: @@ expression E; @@ -read_cache_preload(E) +read_index_preload(_index, E) Additionally manual editing: * drop the define from cache.h. * builtin/{commit,describe}.c were not picked up as we have NULL and the address of an expression. Converted them manually. *

[PATCH 10/24] cache.h: drop cache_name_is_other

Signed-off-by: Stefan Beller --- builtin/clean.c| 2 +- builtin/ls-files.c | 2 +- cache.h| 1 - dir.c | 2 +- wt-status.c| 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index

[PATCH 05/24] cache.h: drop read_cache_unmerged()

@@ @@ -read_cache_unmerged() +read_index_unmerged(_index) Additionally drop the define from cache.h manually. Signed-off-by: Stefan Beller --- builtin/am.c| 2 +- builtin/merge.c | 2 +- builtin/pull.c | 2 +- builtin/read-tree.c | 2 +- builtin/reset.c

[PATCH 07/24] cache.h: drop read_blob_data_from_cache

This was done without cocinelle, as we only have 2 occurrences. Signed-off-by: Stefan Beller --- cache.h | 1 - convert.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cache.h b/cache.h index 9b94339573..d078e88c3f 100644 --- a/cache.h +++

[PATCH 02/24] cache.h: drop active_* macros

Based on the coccinelle patch: @@ @@ -active_cache +the_index.cache @@ @@ -active_nr +the_index.cache_nr @@ @@ -active_alloc +the_index.cache_alloc @@ @@ -active_cache_changed +the_index.cache_changed @@ @@ -active_cache_tree +the_index.cache_tree Additional manual editing: * drop the macros

[PATCH 06/24] unpack-trees.c: rename parameter 'the_index'

As "the_index" is already a global variable, we do not want to confuse the local variable with the global variable. Signed-off-by: Stefan Beller --- unpack-trees.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c

[PATCH 12/24] cache.h: drop cache_dir_exists

Signed-off-by: Stefan Beller --- cache.h | 1 - dir.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cache.h b/cache.h index 85a85f8b96..4b8e8c31fe 100644 --- a/cache.h +++ b/cache.h @@ -368,7 +368,6 @@ extern void free_name_hash(struct index_state

[PATCH 13/24] cache.h: drop is_cache_unborn(), discard_cache(), unmerged_cache()

cocci semantic patch: @@ @@ -is_cache_unborn() +is_index_unborn(_index) @@ @@ -discard_cache() +discard_index(_index) @@ @@ -unmerged_cache() +unmerged_index(_index) Additionally the defines in cache.h were removed manually. Signed-off-by: Stefan Beller --- builtin/am.c

[PATCH 11/24] cache.h: drop cache_file_exists

Signed-off-by: Stefan Beller --- apply.c | 2 +- cache.h | 1 - dir.c | 9 + merge-recursive.c | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apply.c b/apply.c index 159e039a18..eb8eaeabec 100644 --- a/apply.c

[PATCH 03/24] cache.h: drop read_cache_from

coccinelle patch: @@ expression E; @@ -read_cache_from(E) +read_index_from(_index, E) additionally drop the define from cache.h manually Signed-off-by: Stefan Beller --- apply.c | 2 +- builtin/am.c | 4 ++-- builtin/commit.c | 6 +++--- cache.h | 1 -

[PATCH 01/24] cache.h: drop read_cache()

This patch is produced via coccinelle using this semantic patch: @@ @@ -read_cache() +read_index(_index) Additional manual editing: * drop define in cache.h * a comment in builtin/check-ignore.c and read-cache.c were converted * builtin/diff.c: fix error message referencing the function.

[PATCH 24/24] cache.h: retire NO_THE_INDEX_COMPATIBILITY_MACROS

The NO_THE_INDEX_COMPATIBILITY_MACROS pre processor setting was introduced in 4aab5b46f4 (Make read-cache.c "the_index" free., 2007-04-01), stating: This makes all low-level functions defined in read-cache.c to take an explicit index_state structure as their first parameter, to

[PATCH 09/24] cache.h: drop resolve_undo_clear

Signed-off-by: Stefan Beller --- builtin/checkout.c | 2 +- builtin/merge.c| 2 +- builtin/read-tree.c| 2 +- builtin/update-index.c | 2 +- cache.h| 1 - merge.c| 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff

[PATCH 08/24] cache.h: drop unmerge_cache[_entry_at]

Signed-off-by: Stefan Beller --- builtin/update-index.c | 2 +- cache.h| 2 -- rerere.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 8667c48446..b8458016f0 100644 ---

[PATCH 00/24] Retire NO_THE_INDEX_COMPATIBILITY_MACROS

This is the follow up to [1], but actually completed now. The reasoning why this series is a good idea is in the commit message of the last patch, quoted here: The NO_THE_INDEX_COMPATIBILITY_MACROS pre processor setting was introduced in 4aab5b46f4 (Make read-cache.c "the_index" free.,

[PATCH 22/24] cache.h: drop ce_modified

Signed-off-by: Stefan Beller --- builtin/ls-files.c | 2 +- cache.h| 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 3507490d3e..89fac7ddf5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 2, 2017 at 10:51 PM, Kevin Daudt wrote: > On Tue, May 02, 2017 at 08:52:21PM +0200, Ęvar Arnfjörš Bjarmason wrote: >> >> * Due to the bizarro existing semantics of the configure script noted >> upthread if you have a git build script that does --with-libpcre & you >>

[PATCH 15/24] cache.h: drop add_cache_entry

coccinelle patch -add_cache_entry(ce, option) +add_index_entry(_index, ce, option) Additionally drop the define from cache.h manually. Signed-off-by: Stefan Beller --- apply.c| 4 ++-- builtin/blame.c| 3 ++- builtin/checkout.c | 3 ++-

[PATCH 17/24] cache.h: drop remove_file_from_cache

coccinelle patch: @@ expression path; @@ -remove_file_from_cache(path) +remove_file_from_index(_index, path) Additionally drop the define from cache.h manually. Signed-off-by: Stefan Beller --- apply.c| 4 ++-- builtin/commit.c | 2 +-

[PATCH 14/24] cache.h: drop cache_name_pos

coccinelle patch: @@ expression name, namelen; @@ -cache_name_pos(name, namelen) +index_name_pos(_index, name, namelen) Additionally manual editing: * drop the define from cache.h. Signed-off-by: Stefan Beller --- apply.c | 9 + builtin/blame.c

[PATCH 19/24] cache.h: drop add_file_to_cache

Signed-off-by: Stefan Beller --- cache.h | 1 - rerere.c| 2 +- submodule.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cache.h b/cache.h index bc49defc27..a9b059913e 100644 --- a/cache.h +++ b/cache.h @@ -354,7 +354,6 @@ extern void

[PATCH 21/24] cache.h: drop refresh_cache

coccinelle patch: @@ expression flags; @@ -refresh_cache(flags) +refresh_index(_index, flags, NULL, NULL, NULL) Additionally drop the define from cache.h manually. This is a commit where I think the macro expansion is maybe silly, but for reasons outlined in the first patch of the series, we

[PATCH 18/24] cache.h: drop add_to_cache

Signed-off-by: Stefan Beller --- builtin/commit.c | 2 +- cache.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index fa962c4f86..ac4fe97d36 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -287,7

[PATCH 23/24] cache.h: drop ce_match_stat

coccinelle patch: @@ expression ce, st, options; @@ -ce_match_stat(ce, st, options) +ie_match_stat(_index, ce, st, options) Additionally drop the define from cache.h manually. Note that there is an empty define section in cache.h now. The cleanup of that is done in a later patch. Signed-off-by:

[PATCH 20/24] cache.h: drop chmod_cache_entry

Signed-off-by: Stefan Beller --- builtin/add.c | 2 +- builtin/update-index.c | 2 +- cache.h| 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index f6d71b10d0..288b1f5bb3 100644 --- a/builtin/add.c

[PATCH 16/24] cache.h: drop rename_cache_entry_at

One define was unused, the other occurs just once. Easy patch. Signed-off-by: Stefan Beller --- builtin/mv.c | 2 +- cache.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 40e40bb098..1a3c61994c 100644 ---

[PATCH] pack-objects: disable pack reuse for object-selection options

If certain options like --honor-pack-keep, --local, or --incremental are used with pack-objects, then we need to feed each potential object to want_object_in_pack() to see if it should be filtered out. This is totally contrary to the purpose of the pack-reuse optimization, which tries hard to

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

On 29/04/2017 14:26, xiaoqiang zhao wrote: > 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. > With --split option, a auto reconnection will occur when number of > sended > email reaches and the

Re: [PATCH v1] travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503

On Mon, May 1, 2017 at 8:32 PM, Lars Schneider wrote: >> >> this should make the Git for Windows build a bit more stable. We saw >> a few 502's recently. E.g. https://travis-ci.org/git/git/jobs/226669324 >> > Please don't move this to next, yet. This seems not to work as

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

On Mon, May 1, 2017 at 8:03 AM, 赵小强 wrote: > > Thanks for your reply , Junio ! > >> 在 2017年5月1日，09:54，Junio C Hamano 写道： >> >> here. We need to find a better name for the option. Perhaps >> "--batch-size=", "--max-messages-per-connection=" or >>

Re: [PATCH v1] travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503

> On 02 May 2017, at 11:52, Junio C Hamano wrote: > > On Mon, May 1, 2017 at 8:32 PM, Lars Schneider > wrote: >>> >>> this should make the Git for Windows build a bit more stable. We saw >>> a few 502's recently. E.g.

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

Hi Junio, On Sun, 30 Apr 2017, Junio C Hamano wrote: > * js/rebase-i-final (2017-04-27) 9 commits > - rebase -i: rearrange fixup/squash lines using the rebase--helper > - t3415: test fixup with wrapped oneline > - rebase -i: skip unnecessary picks using the rebase--helper > - rebase -i:

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

Ævar Arnfjörð Bjarmason writes: >>> That squash looks good to me. >> >> Thanks. >> >> That is not a particulary helpful comment, by the way. I can help >> topics by contributors by queuing emergency fix at the tip to make >> ones that do not build correctly buildable and

Re: [PATCH v3 0/6] rebase -i: add config to abbreviate command-names

On Tue, May 2, 2017 at 6:00 AM, Liam Beguin wrote: > Add the 'rebase.abbreviateCommands' configuration option to allow > `git rebase -i` to default to the single-letter command-names in > the todo list. > > Using single-letter command-names can present two benefits. > First,

Could GIT manage revision headers embedded in code ?

Hello, We need a great deal of traceability for our source, made of many scripts in interpreted languages, spread in many "independent" modules, as far as can be ;-). In particular, somebody troubleshooting a script in production should be able to know exactly the revision or commit ID (or tag

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 2, 2017 at 2:09 PM, Johannes Schindelin wrote: > Hi Ævar, > > On Sun, 30 Apr 2017, Junio C Hamano wrote: > >> * ab/grep-pcre-v2 (2017-04-25) 20 commits >> - SQUASH??? >> - Makefile & configure: make PCRE v2 the default PCRE implementation >> - grep:

Re: [PATCH v2 14/25] setup_discovered_git_dir(): help static analysis

Hi Junio, On Mon, 1 May 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Coverity reported a memory leak in this function. However, it can only > > be called once, as setup_git_directory() changes global state and hence > > is not reentrant. > > > >

Re: Automating Coverity, was Re: [PATCH 00/26] Address a couple of issues identified by Coverity

Hi Lars, On Mon, 1 May 2017, Lars Schneider wrote: > Looks like Coverity has TravisCI integration and I assume you wouldn't > need to worry about downloading the tool in that setup: > https://scan.coverity.com/travis_ci Except for that tiny little fact that Travis CI does not support Windows

Re: Could GIT manage revision headers embedded in code ?

Hi, On Tue, May 2, 2017 at 1:48 PM, Delanoe Eric wrote: > Hello, > > We need a great deal of traceability for our source, made of many scripts in > interpreted languages, spread in many "independent" modules, as far as can be > ;-). > In particular, somebody troubleshooting a

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

On Tue, May 2, 2017 at 11:35 AM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > That squash looks good to me. >>> >>> Thanks. >>> >>> That is not a particulary helpful comment, by the way. I can help >>> topics by contributors by queuing

[PATCH 0/5] Abide by our own rules regarding line endings

Over the past decade, there have been a couple of attempts to remedy the situation regarding line endings (Windows/DOS line endings are traditionally CR/LF even if many current applications can handle LF, too, Linux/MacOSX/*BSD/Unix uses LF-only line handlings, and old MacOS software used to use

[PATCH 3/5] completion: mark bash script as LF-only

Without this change, the completion script does not work, as Bash expects its scripts to have line feeds as end-of-line markers (this is particularly prominent in quoted multi-line strings, where carriage returns would slip into the strings as verbatim characters otherwise). This change is

[PATCH 1/5] Fix build with core.autocrlf=true

On Windows, the default line endings are denoted by a Carriage Return byte followed by a Line Feed byte, while Linux and MacOSX use a single Line Feed byte to denote a line ending. To help with this situation, Git introduced several mechanisms over the last decade, most prominently the

[PATCH 5/5] t4051: mark supporting files as requiring LF-only line endings

The test t4051-diff-function-context.sh seems to pass on Linux when core.autocrlf=true even without marking its support files as LF-only, but they fail when core.autocrlf=true in Git for Windows' SDK. Signed-off-by: Johannes Schindelin --- t/.gitattributes | 1 + 1

[PATCH 4/5] Fix the remaining tests that failed with core.autocrlf=true

The test suite is mainly developed on Linux and MacOSX, which is the reason that nobody thought to mark files as LF-only as needed. The symptom is a test suite that fails left and right when being checked out using Git for Windows (which defaults to core.autocrlf=true). Mostly, the problems stem

[PATCH 2/5] git-new-workdir: mark script as LF-only

Bash does not handle scripts with CR/LF line endings correctly, therefore they *have* to be forced to LF-only line endings. Funnily enough, this fixes t3000-ls-files-others and t1021-rerere-in-workdir when git.git was checked out with core.autocrlf=true, as these test still use git-new-workdir

PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

Hi Ævar, On Sun, 30 Apr 2017, Junio C Hamano wrote: > * ab/grep-pcre-v2 (2017-04-25) 20 commits > - SQUASH??? > - Makefile & configure: make PCRE v2 the default PCRE implementation > - grep: remove support for concurrent use of both PCRE v1 & v2 > - grep: add support for PCRE v2 > - grep:

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 02, 2017 at 08:52:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > > * Due to the bizarro existing semantics of the configure script noted > upthread if you have a git build script that does --with-libpcre & you > have libpcre1 installed, it'll link to it, but now since > --with-libpcre

Git checkout issue - deleting file without apparent reason

Hi, We are having a strange issue that we haven't been able to pin down. Scenario: master branch and feature branch both have a specific file. 1. Master checked out. 2. git status show no changes / clean staging area. 3. Checkout feature branch . 4. git status show no changes / clean staging

Re: Git checkout issue - deleting file without apparent reason

On Tue, May 2, 2017 at 6:33 PM, Paul van Wichen wrote: > Hi, > > We are having a strange issue that we haven't been able to pin down. > Scenario: master branch and feature branch both have a specific file. > 1. Master checked out. > 2. git status show no changes /

Re: Git checkout issue - deleting file without apparent reason

On Tue, May 02, 2017 at 09:33:02PM -0400, Paul van Wichen wrote: > We are having a strange issue that we haven't been able to pin down. > Scenario: master branch and feature branch both have a specific file. > 1. Master checked out. > 2. git status show no changes / clean staging area. > 3.

Su cuenta bancaria esta bloqueada

Su cuenta bancaria esta bloqueada. Para desbloquear tu cuenta, haz click aqui: http://baccredomaatic.com

[PATCH 5/7] dir: change linkage of cmp_name() and check_contains()

--- dir.c | 4 ++-- dir.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dir.c b/dir.c index f0ddb4608..91103b561 100644 --- a/dir.c +++ b/dir.c @@ -1844,7 +1844,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, return dir_state; }

[PATCH 3/7] dir: add method to check if a dir_entry lexically contains another

Introduce a method that allows us to check if one dir_entry corresponds to a path which contains the path corresponding to another dir_entry. --- dir.c | 8 1 file changed, 8 insertions(+) diff --git a/dir.c b/dir.c index 6bd0350e9..25cb9eadf 100644 --- a/dir.c +++ b/dir.c @@ -1852,6

[PATCH 6/7] builtin/clean: teach clean -d to skip dirs containing ignored files

There is an implicit assumption that a directory containing only untracked and ignored files should itself be considered untracked. This makes sense in use cases where we're asking if a directory should be added to the git database, but not when we're asking if a directory can be safely removed

[PATCH 4/7] dir: hide untracked contents of untracked dirs

When we taught read_directory_recursive() to recurse into untracked directories in search of ignored files given DIR_SHOW_IGNORED_TOO, that had the side effect of teaching it to collect the untracked contents of untracked directories. It does not make sense to return these, so we teach

[PATCH 0/7] Keep git clean -d from inadvertently removing ignored files

This patch series fixes the bug where git clean -d culls directories containing only untracked and ignored files, by first teaching read_directory() and read_directory_recursive() to search "untracked" directories (read: directories *treated* as untracked because they only contain untracked and

[PATCH 7/7] t7061: check for ignored file in untracked dir

--- t/t7061-wtstatus-ignore.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index cdc0747bf..fc6013ba3 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -9,6 +9,7 @@ cat >expected <<\EOF ?? actual ??

[PATCH 2/7] dir: recurse into untracked dirs for ignored files

We consider directories containing only untracked and ignored files to be themselves untracked, which in the usual case means we don't have to search these directories. This is problematic when we want to collect ignored files with DIR_SHOW_IGNORED_TOO, though, so we teach

[PATCH 1/7] t7300: skip untracked dirs containing ignored files

If git sees a directory which contains only untracked and ignored files, clean -d should not remove that directory. --- t/t7300-clean.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index b89fd2a6a..948a455e8 100755 --- a/t/t7300-clean.sh +++

Re: [PATCH v3 1/6] rebase -i: add abbreviated command-names handling

Hi Liam, On Tue, 2 May 2017, Liam Beguin wrote: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 2c9c0165b5ab..9b8a030ff045 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -754,7 +754,7 @@ transform_todo_ids () { > while read

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On 5/2/2017 12:17 AM, Stefan Beller wrote: On Mon, May 1, 2017 at 6:36 PM, Junio C Hamano wrote: Stefan Beller writes: This applies to origin/master. For better readability and understandability for newcomers it is a good idea to not offer 2 APIs

Re: [PATCH v2] add DEVELOPER makefile knob to check for acknowledged warnings

On Thu, Feb 25, 2016 at 9:42 AM, wrote: > From: Lars Schneider > > We assume Git developers have a reasonably modern compiler and recommend > them to enable the DEVELOPER makefile knob to ensure their patches are > clear of all compiler

RE: Could GIT manage revision headers embedded in code ?

Thank you for your quick answer. And great answer ! I'm looking forward to try this. Thanks again and best regards, E.Delanoë -Message d'origine- De : Christian Couder [mailto:christian.cou...@gmail.com] Envoyé : mardi 2 mai 2017 14:11 À : Delanoe Eric Cc : git@vger.kernel.org Objet :

Re: [PATCH v2 09/25] mailinfo & mailsplit: check for EOF while parsing

Hi Junio, On Mon, 1 May 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c > > index 30681681c13..9b3efc8e987 100644 > > --- a/builtin/mailsplit.c > > +++ b/builtin/mailsplit.c > > @@ -233,7 +233,8

Re: [PATCH v2 23/25] name-rev: avoid leaking memory in the `deref` case

Hi Junio, On Mon, 1 May 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >> diff --git a/builtin/name-rev.c b/builtin/name-rev.c > >> index 92a5d8a5d26..a4ce73fb1e9 100644 > >> --- a/builtin/name-rev.c

Re: git loses a commit after reordering.

Hi Junio, Kevin & Nikita, On Mon, 1 May 2017, Junio C Hamano wrote: > Nikita Orlov writes: > > >>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : > >>Not sure if this is the case here, but it at least confirms that rebase > >>--preserve-merges was not meant

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

Hi Ævar, On Tue, 2 May 2017, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 2, 2017 at 2:09 PM, Johannes Schindelin > wrote: > > > > On Sun, 30 Apr 2017, Junio C Hamano wrote: > > > >> * ab/grep-pcre-v2 (2017-04-25) 20 commits > >> - SQUASH??? > >> - Makefile &

Re: [PATCH v2 1/1] t0027: tests are not expensive; remove t0025

Hi Bögi, On Tue, 2 May 2017, tbo...@web.de wrote: > From: Torsten Bögershausen > > The purpose of t0027 is to test all CRLF related conversions at > "git checkout" and "git add". > > Running t0027 under Git for Windows takes 3-4 minutes, so the whole script > had been marked as

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

2017-05-01 14:19 GMT+02:00 Simon Ruderich : > On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote: >> #: config.c:1952 >> #, c-format >> msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" >> -msgstr "" >> +msgstr "Unbekannter Wert '%s' in

[PATCH v3] 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 | 323 --- 1 file changed, 142 insertions(+), 181

Re: [PATCH v3 2/6] rebase -i: add abbreviate_commands function

Hi Liam, On Tue, 2 May 2017, Liam Beguin wrote: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 9b8a030ff045..4fa621062cdf 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -884,6 +884,20 @@ add_exec_commands () { > mv "$1.new"

  1   2   >