Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Johannes Sixt
Am 11.07.2017 um 02:05 schrieb brian m. carlson: On Mon, Jul 10, 2017 at 09:57:40PM +0200, Johannes Sixt wrote: It's a pity, though, that you do not suggest something even more useful, such as C++14. I have tried compiling Git with a C++ compiler, so that I could test whether that was a

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Mike Hommey
On Mon, Jul 10, 2017 at 10:57:57AM -0400, Ben Peart wrote: > Correct. MSVC also supports designated initializers but does not fully > support C99. Precision: *recent versions* of MSVC support designated initializer. 2013 introduced them, but there were bugs until 2015, see e.g.

Re: Flurries of 'git reflog expire'

2017-07-10 Thread Andreas Krey
On Thu, 06 Jul 2017 10:01:05 +, Bryan Turner wrote: > Do you know what version of Bitbucket Server is in use? We're on the newest 4.x. ... > - Run "git config gc.auto 0" in Going that route. ... > I also want to add that Bitbucket Server 5.x includes totally > rewritten GC handling.

Re: [PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 09:02:24PM +0100, Ramsay Jones wrote: > After a quick look at the ./t-basic.sh test, I managed to get > the test to complete (with 15 tests failing), with the following > patch applied: > > -- >8 -- > diff --git a/Makefile b/Makefile > index 3c341b2a6..8e6433738

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 11:11:35PM +0200, Johannes Sixt wrote: > > I am not sure what negative impact you think the macro-ness would > > have to the validity of the result from this test balloon. An old > > compiler that does not understand designated initializer syntax > > would fail to compile

Re: Weirdness with git change detection

2017-07-10 Thread Torsten Bögershausen
On 11/07/17 01:45, Peter Eckersley wrote: I have a local git repo that's in some weird state where changes appear to be detected by "git diff" and prevent operations like "git checkout" from switching branches, but those changes are not removed by a "git reset --hard" or "git stash". Here's

bug: HEAD vs. head on case-insensitive filesystems

2017-07-10 Thread Kenneth Hsu
I'm not sure what the general consensus is regarding the use of "head" vs. "HEAD" on case insensitive filesystems, but it appears that some confusing behavior (bug?) may have arisen. To summarize, "HEAD" and "head" may resolve to different revisions when in a worktree. The following example was

Re: [RFC/WIP PATCH] object store classification

2017-07-10 Thread Stefan Beller
On Fri, Jul 7, 2017 at 9:50 AM, Junio C Hamano wrote: > Ben Peart writes: > >> For more API/state design purity, I wonder if there should be an >> object_store structure that is passed to each of the object store APIs >> instead of passing the repository

[PATCH] RFC: A new type of symbolic refs

2017-07-10 Thread Stefan Beller
A symbolic ref can currently only point at (another symbolic) ref. However are use cases for symbolic refs to point at other things representing a commit-ish, such as gitlink entries in other repositories. In this use case we can use such a symbolic link to strengthen the relationship between a

Re: pre-rebase hook: capture documentation in a <

2017-07-10 Thread brian m. carlson
On Mon, Jul 10, 2017 at 04:35:25PM -0700, Stefan Beller wrote: > Junio wrote in "What's-cooking": > > > ... I do not know how well they are tested > > in the field by people using 'master' in their everyday workflow. > > Ideally, our release process wants to see more people using 'next' > > in

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread brian m. carlson
On Mon, Jul 10, 2017 at 05:07:43PM -0700, Stefan Beller wrote: > On Mon, Jul 10, 2017 at 5:05 PM, brian m. carlson > wrote: > > On Mon, Jul 10, 2017 at 09:57:40PM +0200, Johannes Sixt wrote: > >> It's a pity, though, that you do not suggest something even more

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Stefan Beller
On Mon, Jul 10, 2017 at 5:05 PM, brian m. carlson wrote: > On Mon, Jul 10, 2017 at 09:57:40PM +0200, Johannes Sixt wrote: >> It's a pity, though, that you do not suggest something even more useful, >> such as C++14. > > I have tried compiling Git with a C++ compiler,

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread brian m. carlson
On Mon, Jul 10, 2017 at 09:57:40PM +0200, Johannes Sixt wrote: > It's a pity, though, that you do not suggest something even more useful, > such as C++14. I have tried compiling Git with a C++ compiler, so that I could test whether that was a viable alternative for MSVC in case its C++ mode

Re: Bug - Dirty submodule differences between OSX/Ubuntu

2017-07-10 Thread Stefan Beller
On Mon, Jul 10, 2017 at 4:53 PM, brian m. carlson wrote: > On Sun, Jul 09, 2017 at 01:42:47PM -0700, Steve Kallestad wrote: >> change into the submodule directory and run status >> cd python-mode.el >> git status >> >> On ubuntu: >> On branch master >> Your branch is

Re: Bug - Dirty submodule differences between OSX/Ubuntu

2017-07-10 Thread brian m. carlson
On Sun, Jul 09, 2017 at 01:42:47PM -0700, Steve Kallestad wrote: > change into the submodule directory and run status > cd python-mode.el > git status > > On ubuntu: > On branch master > Your branch is up-to-date with 'origin/master'. > nothing to commit, working directory clean > > On OSX: > On

Weirdness with git change detection

2017-07-10 Thread Peter Eckersley
I have a local git repo that's in some weird state where changes appear to be detected by "git diff" and prevent operations like "git checkout" from switching branches, but those changes are not removed by a "git reset --hard" or "git stash". Here's an example of the behaviour, with "git reset

Re: [GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath()

2017-07-10 Thread Brandon Williams
On 07/10, Stefan Beller wrote: > On Mon, Jul 10, 2017 at 4:32 PM, Brandon Williams wrote: > >> if (!is_submodule_active(the_repository, path)) { > >> - strbuf_reset(); > > > > Is this line removal intended? It doesn't look related to the rest of > > this

Re: [GSoC][PATCH 5/8] submodule: port submodule subcommand 'sync' from shell to C

2017-07-10 Thread Brandon Williams
On 07/11, Prathamesh Chavan wrote: > Port the submodule subcommand 'sync' from shell to C using the same > mechanism as that used for porting submodule subcommand 'status'. > Hence, here the function cmd_sync() is ported from shell to C. > This is done by introducing three functions:

Re: [GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath()

2017-07-10 Thread Stefan Beller
On Mon, Jul 10, 2017 at 4:32 PM, Brandon Williams wrote: >> if (!is_submodule_active(the_repository, path)) { >> - strbuf_reset(); > > Is this line removal intended? It doesn't look related to the rest of > this patch. It is, as is re-used and has to be

Re: [GSoC][PATCH 4/8] submodule: port submodule subcommand 'status' from shell to C

2017-07-10 Thread Brandon Williams
On 07/11, Prathamesh Chavan wrote: > This aims to make git-submodule 'status' a built-in. Hence, the function > cmd_status() is ported from shell to C. This is done by introducing > three functions: module_status(), submodule_status() and print_status(). > > The function module_status() acts as

pre-rebase hook: capture documentation in a <

2017-07-10 Thread Stefan Beller
From: Jonathan Nieder Without this change, the sample hook does not pass a syntax check (sh -n): $ sh -n hooks--pre-rebase.sample hooks--pre-rebase.sample: line 101: syntax error near unexpected token `(' hooks--pre-rebase.sample: line 101: ` merged into it again

Re: [GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath()

2017-07-10 Thread Brandon Williams
On 07/11, Prathamesh Chavan wrote: > Introduce function get_submodule_displaypath() to replace the code > occurring in submodule_init() for generating displaypath of the > submodule with a call to it. > > This new function will also be used in other parts of the system > in later patches. > >

[GSoC][PATCH 7/8] diff: change scope of the function count_lines()

2017-07-10 Thread Prathamesh Chavan
Change the scope of function count_lines for allowing the function to be reused in other parts of the code as well. Mentored-by: Christian Couder Mentored-by: Stefan Beller Signed-off-by: Prathamesh Chavan --- diff.c | 2 +-

[GSoC][PATCH 5/8] submodule: port submodule subcommand 'sync' from shell to C

2017-07-10 Thread Prathamesh Chavan
Port the submodule subcommand 'sync' from shell to C using the same mechanism as that used for porting submodule subcommand 'status'. Hence, here the function cmd_sync() is ported from shell to C. This is done by introducing three functions: module_sync(), sync_submodule() and

[GSoC][PATCH 3/8] submodule: port set_name_rev() from shell to C

2017-07-10 Thread Prathamesh Chavan
Function set_name_rev() is ported from git-submodule to the submodule--helper builtin. The function get_name_rev() generates the value of the revision name as required, and the function print_name_rev() handles the formating and printing of the obtained revision name. Mentored-by: Christian

[GSoC][PATCH 8/8] submodule: port submodule subcommand 'summary' from shell to C

2017-07-10 Thread Prathamesh Chavan
The submodule subcommand 'summary' is ported in the process of making git-submodule a builtin. The function cmd_summary() from git-submodule.sh is ported to functions module_summary(), compute_summary_module_list(), prepare_submodule_summary() and print_submodule_summary(). The first function

[GSoC][PATCH 6/8] submodule: port submodule subcommand 'deinit' from shell to C

2017-07-10 Thread Prathamesh Chavan
The same mechanism is used even for porting this submodule subcommand, as used in the ported subcommands till now. The function cmd_deinit in split up after porting into three functions: module_deinit(), for_each_submodule_list() and deinit_submodule(). Mentored-by: Christian Couder

[GSoC][PATCH 4/8] submodule: port submodule subcommand 'status' from shell to C

2017-07-10 Thread Prathamesh Chavan
This aims to make git-submodule 'status' a built-in. Hence, the function cmd_status() is ported from shell to C. This is done by introducing three functions: module_status(), submodule_status() and print_status(). The function module_status() acts as the front-end of the subcommand. It parses

[GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath()

2017-07-10 Thread Prathamesh Chavan
Introduce function get_submodule_displaypath() to replace the code occurring in submodule_init() for generating displaypath of the submodule with a call to it. This new function will also be used in other parts of the system in later patches. Mentored-by: Christian Couder

[GSoC][PATCH 2/8] submodule--helper: introduce for_each_submodule_list()

2017-07-10 Thread Prathamesh Chavan
Introduce function for_each_submodule_list() and replace a loop in module_init() with a call to it. The new function will also be used in other parts of the system in later patches. Mentored-by: Christian Couder Mentored-by: Stefan Beller

Re: [PATCH 1/7] api-builtin.txt: document SUPPORT_SUPER_PREFIX

2017-07-10 Thread Brandon Williams
On 07/10, Martin Ågren wrote: > Commit 74866d75 ("git: make super-prefix option", 2016-10-07) introduced > SUPPORT_SUPER_PREFIX as a builtin flag without documenting it in > api-builtin.txt. The next patch will add another flag, so document > SUPPORT_SUPER_PREFIX, thereby bringing the

What's cooking in git.git (Jul 2017, #03; Mon, 10)

2017-07-10 Thread Junio C Hamano
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. We also have tons of small

[GSoC] Update: Week 8

2017-07-10 Thread Prathamesh Chavan
SUMMARY OF MY PROJECT: Git submodule subcommands are currently implemented by using shell script 'git-submodule.sh'. There are several reasons why we'll prefer not to use the shell script. My project intends to convert the subcommands into C code, thus making them builtins. This will increase

Re: [PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-10 Thread Junio C Hamano
Martin Ågren writes: > Using, e.g., `git -c pager.tag tag -a new-tag` results in errors > such as "Vim: Warning: Output is not to a terminal" and a garbled > terminal. A user who makes use of `git tag -a` and `git tag -l` > will probably choose not to configure

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Brandon Williams
On 07/10, Jeff King wrote: > On Sun, Jul 09, 2017 at 10:05:49AM -0700, Junio C Hamano wrote: > > > René Scharfe writes: > > > > > I wonder when we can begin to target C99 in git's source, though. :) > > > > Let's get the ball rolling by starting to use some of the useful > >

Re: [PATCH] push: disable lazy --force-with-lease by default

2017-07-10 Thread Stefan Beller
On Thu, Jul 6, 2017 at 3:39 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt >>> index 0a639664fd..1fa01210a2 100644 >>> --- a/Documentation/git-push.txt >>> +++

[PATCH 7/7] tag: make git tag -l use pager by default

2017-07-10 Thread Martin Ågren
The previous patch introduced `pager.tag.list`. Its default was to use the value of `pager.tag` or, if that was also not set, to fall back to "off". Change that fallback value to "on". Let the default value for `pager.tag` remain at "off". Update documentation and tests. Signed-off-by: Martin

[PATCH 6/7] tag: make git tag -l consider new config `pager.tag.list`

2017-07-10 Thread Martin Ågren
Using, e.g., `git -c pager.tag tag -a new-tag` results in errors such as "Vim: Warning: Output is not to a terminal" and a garbled terminal. A user who makes use of `git tag -a` and `git tag -l` will probably choose not to configure `pager.tag` or to set it to "no", so that `git tag -a` will

[PATCH 5/7] tag: handle `pager.tag`-configuration within the builtin

2017-07-10 Thread Martin Ågren
Use the mechanisms introduced in two earlier patches to ignore `pager.tag` in git.c and let the `git tag` builtin handle it on its own. This is in preparation for the next patch, where we will want to handle slightly different configuration variables depending on which options are used with `git

[PATCH 2/7] git.c: let builtins opt for handling `pager.foo` themselves

2017-07-10 Thread Martin Ågren
Before launching a builtin git foo and unless mechanisms with precedence are in use, we check for and handle the `pager.foo` config. This is done without considering exactly how git foo is being used, and indeed, git.c cannot (and should not) know what the arguments to git foo are supposed to

[PATCH 4/7] t7006: add tests for how git tag paginates

2017-07-10 Thread Martin Ågren
Using, e.g., `git -c pager.tag tag -a new-tag` results in errors such as "Vim: Warning: Output is not to a terminal" and a garbled terminal. A user who makes use of `git tag -a` and `git tag -l` will probably choose not to configure `pager.tag` or to set it to "no", so that `git tag -a` will

[PATCH 3/7] git.c: provide setup_auto_pager()

2017-07-10 Thread Martin Ågren
The previous patch introduced a way for builtins to declare that they will take responsibility for handling the `pager.foo`-config item. (See the commit message of that patch for why that could be useful.) Provide setup_auto_pager(), which builtins can call in order to handle `pager.`, including

[PATCH 1/7] api-builtin.txt: document SUPPORT_SUPER_PREFIX

2017-07-10 Thread Martin Ågren
Commit 74866d75 ("git: make super-prefix option", 2016-10-07) introduced SUPPORT_SUPER_PREFIX as a builtin flag without documenting it in api-builtin.txt. The next patch will add another flag, so document SUPPORT_SUPER_PREFIX, thereby bringing the documentation up to date with the available flags.

[PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-10 Thread Martin Ågren
Using, e.g., `git -c pager.tag tag -a new-tag` results in errors such as "Vim: Warning: Output is not to a terminal" and a garbled terminal. A user who makes use of `git tag -a` and `git tag -l` will probably choose not to configure `pager.tag` or to set it to "no", so that `git tag -a` will

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Junio C Hamano
Stefan Beller writes: > On Mon, Jul 10, 2017 at 9:44 AM, Junio C Hamano wrote: > > Credit goes to Brandon for spotting it, but the introduction of > "trailing comma at the end of enum definition is allowed in c99" > is e1327023ea (grep: refactor the

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Junio C Hamano
Johannes Sixt writes: >> I am not sure what negative impact you think the macro-ness would >> have to the validity of the result from this test balloon. An old >> compiler that does not understand designated initializer syntax >> would fail to compile both the same way, no? >> >>

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Johannes Sixt
Am 10.07.2017 um 22:38 schrieb Junio C Hamano: Johannes Sixt writes: It's a pity, though, that you do not suggest something even more useful, such as C++14. I cannot tell if this part is tongue-in-cheek (especially the "++"), so I will ignore it to avoid wasting time.

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Junio C Hamano
Johannes Sixt writes: > It's a pity, though, that you do not suggest something even more > useful, such as C++14. I cannot tell if this part is tongue-in-cheek (especially the "++"), so I will ignore it to avoid wasting time. >> Subject: [PATCH] strbuf: use designated

Bug: Git checkout case Insensitive branch name compare

2017-07-10 Thread kinchit raja
Bugs Details: Git checkout case Insensitive branch name compare Steps to Reproduce: I have a remote branch which is as shown below. Example: feature_12345_write.netCodeForSomeFeature I used the git command on git bash and typed "feature_12345_write.NetCodeForSomeFeature" thinking I am

Re: [PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Ramsay Jones
On 10/07/17 18:44, Jeff King wrote: > On Mon, Jul 10, 2017 at 10:35:24AM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >>> You can already build and test with ASan by doing: >>> >>> make CFLAGS=-fsanitize=address test >>> >>> but there are a few slight annoyances: >>>

Re: [PATCH 4/4] hook: add a simple first example

2017-07-10 Thread Junio C Hamano
Kaartic Sivaraam writes: > I made an attempt to make the second example work with amending > with the aim of making it suitable for usage out of the box. It > seems that it's not easy to make it work as the status of a file > cannot be determined correctly

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Johannes Sixt
Am 10.07.2017 um 09:03 schrieb Jeff King: On Sun, Jul 09, 2017 at 10:05:49AM -0700, Junio C Hamano wrote: René Scharfe writes: I wonder when we can begin to target C99 in git's source, though. :) Let's get the ball rolling... Good to know that you do not resist moving to a

Re: [PATCH 3/4] hook: add signature using "interpret-trailers"

2017-07-10 Thread Junio C Hamano
Ramsay Jones writes: >> It works well in all cases except when the user invokes >> "git commit" without any arguments. In that case manually >> add a new line after the first line to ensure it's consistent >> with the output of "-s" option. >> > > Again,

Re: [PATCH 2/4] hook: name the positional variables

2017-07-10 Thread Junio C Hamano
Kaartic Sivaraam writes: > It's always nice to have named variables instead of > positional variables as they communicate their purpose > well. > > Appropriately name the positional variables of the hook > to make it easier to see what's going on. > >

Re: [PATCH 1/4] hook: cleanup script

2017-07-10 Thread Junio C Hamano
Kaartic Sivaraam writes: > Prepare the 'preare-commit-msg' sample script for > upcoming changes. Preparation includes removal of > an example that has outlived it's purpose. The example > is the one that comments the "Conflicts:" part of a > merge commit message.

[PATCH] ref-filter.c: drop return from void function

2017-07-10 Thread Alejandro R . Sedeño
Sun's C compiler errors out on this pattern: void foo() { ... } void bar() { return foo(); } Signed-off-by: Alejandro R. Sedeño --- ref-filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ref-filter.c b/ref-filter.c index 2cc7b01..467c027 100644 ---

Re: [PATCH] l10n: de.po: fix typo

2017-07-10 Thread Junio C Hamano
Ralf Thielow writes: > Reported-by: Andre Hinrichs > Signed-off-by: Ralf Thielow > --- > Hi Andre, > > thanks for the bugreport! > > Ralf Thanks. Let me take it directly to 'maint'.

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-10 Thread William Duclot
Junio C Hamano writes: > William Duclot writes: > > > diff --git a/git-rebase.sh b/git-rebase.sh > > index 2cf73b88e..50457f687 100755 > > --- a/git-rebase.sh > > +++ b/git-rebase.sh > > @@ -55,9 +55,10 @@ LF=' > > ' > > ok_to_skip_pre_rebase= > > resolvemsg=" > >

Re: [PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Junio C Hamano
Jeff King writes: > On Mon, Jul 10, 2017 at 10:35:24AM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> > You can already build and test with ASan by doing: >> > >> > make CFLAGS=-fsanitize=address test >> > >> > but there are a few slight annoyances:

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Ben Peart
On 7/10/2017 12:04 PM, Jeff King wrote: On Mon, Jul 10, 2017 at 10:57:57AM -0400, Ben Peart wrote: If this patch can survive a few releases without complaint, then we can feel more confident that designated initializers are widely supported by our user base. It also is an indication that

Re: [PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 10:35:24AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > You can already build and test with ASan by doing: > > > > make CFLAGS=-fsanitize=address test > > > > but there are a few slight annoyances: > > > > 1. It's a little long to type. > > >

Re: [PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Junio C Hamano
Jeff King writes: > You can already build and test with ASan by doing: > > make CFLAGS=-fsanitize=address test > > but there are a few slight annoyances: > > 1. It's a little long to type. > > 2. It override your CFLAGS completely. You'd probably > still want -O2, for

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Stefan Beller
On Mon, Jul 10, 2017 at 9:44 AM, Junio C Hamano wrote: > Jeff King writes: > >>> That way, we will see if there are people who need pre-C99 soon >>> enough, and we won't have to scramble reverting too many changes >>> when it happens. >> >> Neat idea. Something

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Andreas Schwab
On Jul 10 2017, Jeff King wrote: > If this patch can survive a few releases without complaint, > then we can feel more confident that designated initializers > are widely supported by our user base. It also is an > indication that other C99 features may be supported, but not > a

Re: What's cooking in git.git (Jul 2017, #01; Wed, 5)

2017-07-10 Thread Stefan Beller
On Thu, Jul 6, 2017 at 7:13 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Speaking of submodules, It's not just features, but I also send bug fixes. ;) >> https://public-inbox.org/git/20170630003851.17288-1-sbel...@google.com/ >> (That patch is not

Re: [PATCH 2/5] test-lib: turn on ASan abort_on_error by default

2017-07-10 Thread Junio C Hamano
Jeff King writes: > By default, ASan will exit with code 1 when it sees an > error. This means we'll notice a problem when we expected > git to succeed, but not in a test_must_fail block. > > Let's ask it to actually raise SIGABRT instead. That will > give us a signal death that

Re: [PATCH] use DIV_ROUND_UP

2017-07-10 Thread René Scharfe
Am 10.07.2017 um 09:27 schrieb Jeff King: On Sat, Jul 08, 2017 at 12:35:35PM +0200, René Scharfe wrote: diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 2dc9c82ecf..06c479f70a 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -210,8 +210,8 @@ size_t ewah_add(struct

Re: [PATCH] doc: correct a mistake in an illustration

2017-07-10 Thread Junio C Hamano
Kaartic Sivaraam writes: > The first illustration of the "RECOVERING FROM UPSTREAM REBASE" > section in the 'git-rebase' documentation wasn't in line with the > rest of the illustrations of that section. > > Correct it. Yeah. It is unclear from the lack of

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Junio C Hamano
Jeff King writes: >> That way, we will see if there are people who need pre-C99 soon >> enough, and we won't have to scramble reverting too many changes >> when it happens. > > Neat idea. Something like this? Yes, your log message said everything I wanted to say, including

Performance improvement for git pull rebase and autostash

2017-07-10 Thread neuling
Sorry, the max characters per line restriction of the e-mail broke the workflow. Here it is again. git pull rebase = true or preserve | | | |

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-10 Thread Junio C Hamano
William Duclot writes: > diff --git a/git-rebase.sh b/git-rebase.sh > index 2cf73b88e..50457f687 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -55,9 +55,10 @@ LF=' > ' > ok_to_skip_pre_rebase= > resolvemsg=" > -$(gettext 'When you have resolved this

[PATCH] l10n: de.po: fix typo

2017-07-10 Thread Ralf Thielow
Reported-by: Andre Hinrichs Signed-off-by: Ralf Thielow --- Hi Andre, thanks for the bugreport! Ralf po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 679f8f4..42c4508 100644 --- a/po/de.po

Re: [PATCH 1/4] Doc/config.txt: explain repeated sections

2017-07-10 Thread Junio C Hamano
Jeff King writes: > FWIW, the use of "multivalued" here tickled my spider sense, too. I > think when talking on the list we generally reserve "multivalued" for > true "we expect this to be a list" variables. But the only mention of > "multivalued" in the config documentation seems

Re: [PATCH 6/6] reflog-walk: stop using fake parents

2017-07-10 Thread Junio C Hamano
Eric Wong writes: > To notice similar errors sooner, I wonder if we should have a > test target for 64-bit users to test with -m32 enabled, somehow. Thanks. Hopefully https://travis-ci.org/git/git/jobs/251772744 and its later incarnations should be sufficient?

Performance improvement for git pull rebase and autostash

2017-07-10 Thread neuling
Hi, I have some suggestions to improve performance of 'git pull --rebase'. 1. If I have no new local commits "git pull --rebase" will do a fast forward merge. But if I have changes to local files I have to stash them also if they are not affected by the new commits from origin. I think in

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 10:57:57AM -0400, Ben Peart wrote: > > If this patch can survive a few releases without complaint, > > then we can feel more confident that designated initializers > > are widely supported by our user base. It also is an > > indication that other C99 features may be

Re: [PATCH 0/5] building git with clang/gcc address sanitizer

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 04:40:42PM +0200, Lars Schneider wrote: > > If you want to see it in action, you can do: > > > > make SANITIZE=address > > ./git log -g HEAD HEAD >/dev/null > > > > which finds a bug I recently fixed (but the fix isn't in master yet). > > Do you think it would make

Re: [RFC/PATCH v4 30/49] odb-helper: add read_object_process()

2017-07-10 Thread Ben Peart
On 6/20/2017 3:55 AM, Christian Couder wrote: From: Ben Peart Signed-off-by: Ben Peart Signed-off-by: Christian Couder --- odb-helper.c | 202 ---

Re: [PATCH 3/4] hook: add signature using "interpret-trailers"

2017-07-10 Thread Ramsay Jones
On 10/07/17 15:17, Kaartic Sivaraam wrote: > The sample hook to prepare the commit message before > a commit allows users to opt-in to add the signature > to the commit message. The signature is added at a place > that isn't consistent with the "-s" option of "git commit". > Further, it could go

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-10 Thread Ben Peart
On 7/10/2017 3:03 AM, Jeff King wrote: On Sun, Jul 09, 2017 at 10:05:49AM -0700, Junio C Hamano wrote: René Scharfe writes: I wonder when we can begin to target C99 in git's source, though. :) Let's get the ball rolling by starting to use some of the useful features like

Re: [PATCH 0/5] building git with clang/gcc address sanitizer

2017-07-10 Thread Lars Schneider
> On 10 Jul 2017, at 15:24, Jeff King wrote: > > I mentioned recently that I sometimes run the test suite with ASan, so > here are a few tweaks to make this easier (most of which I've been > carrying in my personal config.mak for a few years). > > In my experience ASan does at

Re: [PATCH v5 0/7] Fast git status via a file system watcher

2017-07-10 Thread Ben Peart
On 7/10/2017 9:36 AM, Ben Peart wrote: On 6/28/2017 1:11 AM, Christian Couder wrote: On Sat, Jun 10, 2017 at 3:40 PM, Ben Peart wrote: Changes from V4 include: ... I took a look at this patch series except the last patch ([PATCH v5 7/7] fsmonitor: add a performance

[PATCH] doc: correct a mistake in an illustration

2017-07-10 Thread Kaartic Sivaraam
The first illustration of the "RECOVERING FROM UPSTREAM REBASE" section in the 'git-rebase' documentation wasn't in line with the rest of the illustrations of that section. Correct it. Signed-off-by: Kaartic Sivaraam --- Documentation/git-rebase.txt | 2 +- 1

[PATCH 3/4] hook: add signature using "interpret-trailers"

2017-07-10 Thread Kaartic Sivaraam
The sample hook to prepare the commit message before a commit allows users to opt-in to add the signature to the commit message. The signature is added at a place that isn't consistent with the "-s" option of "git commit". Further, it could go out of view in certain cases. Add the signature in a

[PATCH 4/4] hook: add a simple first example

2017-07-10 Thread Kaartic Sivaraam
Add a simple example that replaces an outdated example that was removed. This ensures that there's at the least a simple example that illustrates what could be done using the hook just by enabling it. Also, update the documentation. Signed-off-by: Kaartic Sivaraam

[PATCH 2/4] hook: name the positional variables

2017-07-10 Thread Kaartic Sivaraam
It's always nice to have named variables instead of positional variables as they communicate their purpose well. Appropriately name the positional variables of the hook to make it easier to see what's going on. Signed-off-by: Kaartic Sivaraam ---

[PATCH 1/4] hook: cleanup script

2017-07-10 Thread Kaartic Sivaraam
Prepare the 'preare-commit-msg' sample script for upcoming changes. Preparation includes removal of an example that has outlived it's purpose. The example is the one that comments the "Conflicts:" part of a merge commit message. It isn't relevant anymore as it's done by default since 261f315b

Re: "Branch exists" error while trying to rename a non-existing branch to an existing one

2017-07-10 Thread Kaartic Sivaraam
On Sun, 2017-07-09 at 11:57 -0700, Junio C Hamano wrote: > This is borderline "meh" at least to me.  An argument against a > hypothetical version of Git that "fixes" your issue would be that no > matter what the source of renaming is, as long as 'master' exists, > "branch -m" shouldn't overwrite

Re: [PATCH v5 0/7] Fast git status via a file system watcher

2017-07-10 Thread Ben Peart
On 6/28/2017 1:11 AM, Christian Couder wrote: On Sat, Jun 10, 2017 at 3:40 PM, Ben Peart wrote: Changes from V4 include: ... I took a look at this patch series except the last patch ([PATCH v5 7/7] fsmonitor: add a performance test) as Junio reviewed it already, and had

Re: [PATCH 0/5] building git with clang/gcc address sanitizer

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 09:24:18AM -0400, Jeff King wrote: > You can also try: > > make SANITIZE=thread test > > but it's not clean. I poked at some of the errors, and I don't think > there a problem in practice (though they may be worth cleaning up in the > name of code hygiene). Here's an

Re: [PATCH v2 3/7] log: do not free parents when walking reflog

2017-07-10 Thread Jeff King
On Sun, Jul 09, 2017 at 09:59:33AM -0700, Junio C Hamano wrote: > >> After step 6/7, we no longer "allow cycles in reflog ancestry", as > >> there will be no reflog ancestry to speak of ;-), so it would be > >> nice to remove the comment above in that step. But alternatively, > >> we can

[PATCH 4/5] Makefile: turn off -fomit-frame-pointer with sanitizers

2017-07-10 Thread Jeff King
The ASan manual recommends disabling this optimization, as it can make the backtraces produced by the tool harder to follow (and since this is a test-debug build, we don't care about squeezing out every last drop of performance). Signed-off-by: Jeff King --- Makefile | 1 + 1

[PATCH 5/5] Makefile: disable unaligned loads with UBSan

2017-07-10 Thread Jeff King
The undefined behavior sanitizer complains about unaligned loads, even if they're OK for a particular platform in practice. It's possible that they _are_ a problem, of course, but since it's a known tradeoff the UBSan errors are just noise. Let's quiet it automatically by building with

[PATCH 3/5] Makefile: add helper for compiling with -fsanitize

2017-07-10 Thread Jeff King
You can already build and test with ASan by doing: make CFLAGS=-fsanitize=address test but there are a few slight annoyances: 1. It's a little long to type. 2. It override your CFLAGS completely. You'd probably still want -O2, for instance. 3. It's a good idea to also turn off

[PATCH 2/5] test-lib: turn on ASan abort_on_error by default

2017-07-10 Thread Jeff King
By default, ASan will exit with code 1 when it sees an error. This means we'll notice a problem when we expected git to succeed, but not in a test_must_fail block. Let's ask it to actually raise SIGABRT instead. That will give us a signal death that test_must_fail will notice. As a bonus, it may

[PATCH 0/5] building git with clang/gcc address sanitizer

2017-07-10 Thread Jeff King
I mentioned recently that I sometimes run the test suite with ASan, so here are a few tweaks to make this easier (most of which I've been carrying in my personal config.mak for a few years). In my experience ASan does at least as well as valgrind at finding memory bugs, and runs way faster. With

[PATCH 1/5] test-lib: set ASAN_OPTIONS variable before we run git

2017-07-10 Thread Jeff King
We turn off ASan's leak detection by default in the test suite because it's too noisy. But we don't do so until part-way through test-lib. This is before we've run any tests, but after we do our initial "./git" to see if the binary has even been built. When built with clang, this seems to work

Darlehensangebot gelten jetzt

2017-07-10 Thread Ocean Finance®
Schönen Tag,   Brauchen Sie eine finanzielle Unterstützung? Brauchen Sie einen legitimen Kredit für Zinsen? Brauchen Sie ein Business-Darlehen? Brauchen Sie ein Darlehen, um ein Haus zu kaufen, Auto, zahlen Sie Ihre Rechnungen und Schulden? Brauchen Sie Geld, um Probleme zu lösen? Wenn so

Re: [PATCH 6/6] reflog-walk: stop using fake parents

2017-07-10 Thread Jeff King
On Mon, Jul 10, 2017 at 09:42:55AM +, Eric Wong wrote: > > Thanks, I was able to reproduce with CFLAGS=-m32. > > No problem and thanks for the quick response! Latest pu is > fine for me. > > To notice similar errors sooner, I wonder if we should have a > test target for 64-bit users to

Re: Small typo in german translation

2017-07-10 Thread Kevin Daudt
On Mon, Jul 10, 2017 at 08:47:23AM +0200, Andre Hinrichs wrote: > Hi Git-Developers! > > I've found a small typo in git/po/de.po > In line 8567 the word "erwzingen" should be "erzwingen". > Please fix. > > Thanks > Hello Andre, The best way to get this fixed is to make a pull-request on the

  1   2   >