Profile feedback patchkit v2

Fix the bitrotted profile feedback support. Changes to v1: - Remove obsolete comment - Remove controversal diff script. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

[PATCH 1/4] Use BASIC_FLAGS for profile feedback

From: Andi Kleen a...@linux.intel.com Use BASIC_CFLAGS instead of CFLAGS to set up the profile feedback option in the Makefile. This allows still overriding CFLAGS on the make command line without disabling profile feedback. Signed-off-by: Andi Kleen a...@linux.intel.com --- Makefile | 4 ++--

[PATCH 4/4] Fix profile feedback with -jN and add profile-fast

From: Andi Kleen a...@linux.intel.com Profile feedback always failed for me with -jN. The problem was that there was no implicit ordering between the profile generate stage and the profile use stage. So some objects in the later stage would be linked with profile generate objects, and fail due to

[PATCH 3/4] Run the perf test suite for profile feedback too

From: Andi Kleen a...@linux.intel.com Signed-off-by: Andi Kleen a...@linux.intel.com --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a9770ac..ba64be9 100644 --- a/Makefile +++ b/Makefile @@ -1647,6 +1647,7 @@ ifeq ($(filter all,$(MAKECMDGOALS)),all)

[PATCH 2/4] Don't define away __attribute__ on gcc

From: Andi Kleen a...@linux.intel.com Profile feedback sets -DNO_NORETURN, which causes the compat header file to go into a default #else block. That #else block defines away __attribute__(). Doing so causes all kinds of problems with the Linux and gcc system headers: in particular it makes the

Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit

On Tue, Jul 8, 2014 at 7:26 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: diff --git a/builtin/commit.c b/builtin/commit.c index 9cfef6c..5981755 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -342,6 +342,8 @@ static char *prepare_index(int

[PATCH] log: fix indentation for --graph --show-signature

The git log --graph --show-signature command incorrectly indents the gpg information about signed commits and merged signed tags. It does not follow the level of indentation of the current commit. Example of garbled output: $ git log --show-signature --graph * commit

Re: [PATCH v20 07/48] lockfile.c: make lock_file return a meaningful errno on failurei

On 06/20/2014 04:42 PM, Ronnie Sahlberg wrote: Making errno when returning from lock_file() meaningful, which should fix * an existing almost-bug in lock_ref_sha1_basic where it assumes errno==ENOENT is meaningful and could waste some work on retries * an existing bug in

Re: [PATCH v20 22/48] refs.c: make ref_transaction_begin take an err argument

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Add an err argument to _begin so that on non-fatal failures in future ref backends we can report a nice error back to the caller. While _begin can currently never fail for other reasons than OOM, in which case we die() anyway, we may add other

Re: [PATCH v20 20/48] refs.c: change ref_transaction_create to do error checking and return status

I'm in my next attempt to get through your patch series. Sorry for the long hiatus. Patches 1-19 look OK aside from a minor typo that I just reported. See below for a comment on this patch. On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Do basic error checking in ref_transaction_create() and

Re: [PATCH v20 23/48] refs.c: add transaction.status and track OPEN/CLOSED/ERROR

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Track the status of a transaction in a new status field. Check the field for The status field is not set or used anywhere. The field that you use is state. sanity, i.e. that status must be OPEN when _commit/_create/_delete or _update is called

Re: [PATCH v20 27/48] sequencer.c: use ref transactions for all ref updates

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Change to use ref transactions for all updates to refs. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- sequencer.c | 24 1 file changed, 16 insertions(+), 8

Re: [PATCH v20 24/48] tag.c: use ref transactions when doing updates

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Change tag.c to use ref transactions for all ref updates. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/tag.c | 15 +-- 1 file changed, 9 insertions(+), 6

Re: [PATCH v20 25/48] replace.c: use the ref transaction functions for updates

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Update replace.c to use ref transactions for updates. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/replace.c | 15 +-- 1 file changed, 9 insertions(+), 6

[PATCH] path: for clarity, rename get_pathname to get_path_buffer

The get_pathname function does not really return path name but rather a buffer to store pathname in. As such, current name is a bit confusing. Change the name as to make it clearer what the function is doing. Signed-off-by: Michal Nazarewicz min...@mina86.com --- path.c | 8 1 file

Re: [PATCH v20 30/48] refs.c: change update_ref to use a transaction

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Change the update_ref helper function to use a ref transaction internally. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c | 28 1 file changed, 24

[PATCH] path: for clarity, rename get_pathname to get_path_buffer

The get_pathname function does not really return path name but rather a buffer to store pathname in. As such, current name is a bit confusing. Change the name as to make it clearer what the function is doing. Signed-off-by: Michal Nazarewicz min...@mina86.com --- path.c | 8 1 file

Re: [PATCH v20 31/48] receive-pack.c: use a reference transaction for updating the refs

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Wrap all the ref updates inside a transaction. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/receive-pack.c | 96 +- 1 file changed, 63 insertions(+), 33 deletions(-) diff

Re: [PATCH v20 33/48] walker.c: use ref transaction for ref updates

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Switch to using ref transactions in walker_fetch(). As part of the refactoring to use ref transactions we also fix a potential memory leak where in the original code if write_ref_sha1() would fail we would end up returning from the function

Re: [PATCH v20 37/48] refs.c: remove lock_ref_sha1

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: lock_ref_sha1 was only called from one place in refc.c and only provided a check that the refname was sane before adding back the initial refs/ part of the ref path name, the initial refs/ that this caller had already stripped off before calling

Re: [PATCH v20 39/48] refs.c: make delete_ref use a transaction

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Change delete_ref to use a ref transaction for the deletion. At the same time since we no longer have any callers of repack_without_ref we can now delete this function. Change delete_ref to return 0 on success and 1 on failure instead of the

Re: [PATCH v20 40/48] refs.c: add an err argument to delete_ref_loose

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Add an err argument to delete_loose_ref so that we can pass a descriptive error string back to the caller. Pass the err argument from transaction commit to this function so that transaction users will have a nice error string if the transaction

Re: [PATCH v20 41/48] refs.c: pass the ref log message to _create/delete/update instead of _commit

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Change the reference transactions so that we pass the reflog message through to the create/delete/update function instead of the commit message. This allows for individual messages for each change in a multi ref transaction. Reviewed-by:

Re: [PATCH v20 43/48] refs.c: move the check for valid refname to lock_ref_sha1_basic

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Move the check for check_refname_format from lock_any_ref_for_update to lock_ref_sha1_basic. At some later stage we will get rid of lock_any_ref_for_update completely. If lock_ref_sha1_basic fails the check_refname_format test, set errno to

Re: [PATCH v20 44/48] refs.c: call lock_ref_sha1_basic directly from commit

On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote: Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic directly from the commit function. This commit is obviously hostage to whether commit 43/48 is kept. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by:

[PATCH] http: Add Accept-Language header if possible

From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by 'LANGUAGE' environment variable if the variable is not empty. Example: LANGUAGE= - LANGUAGE=ko - Accept-Language: ko; q=1.000, *; q=0.001 LANGUAGE=ko:en -

[PATCH] diff-tree: call free_commit_list() instead of duplicating its code

Signed-off-by: Rene Scharfe l@web.de --- builtin/diff-tree.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index be6417d..ce0e019 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -22,14 +22,10 @@ static int

[PATCH] line-log: use commit_list_append() instead of duplicating its code

Signed-off-by: Rene Scharfe l@web.de --- line-log.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/line-log.c b/line-log.c index 1500101..afcc98d 100644 --- a/line-log.c +++ b/line-log.c @@ -1174,9 +1174,7 @@ static int process_ranges_merge_commit(struct rev_info

Re: [PATCH v20 00/48] Use ref transactions

On 06/20/2014 04:42 PM, Ronnie Sahlberg wrote: This patch series can also be found at https://github.com/rsahlberg/git/tree/ref-transactions This patch series is based on current master and expands on the transaction API. It converts all ref updates, inside refs.c as well as external, to use

Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit

Duy Nguyen pclo...@gmail.com writes: I wonder if we need to update_main_cache_tree() so many times in this function. If I read the code correctly, all roads must lead to update_main_cache_tree(0) in prepare_to_commit(). I think prepare-to-commit is too late; it does not want to know if the

Re: [PATCH v5 3/4] cache-tree: subdirectory tests

David Turner dtur...@twopensource.com writes: + printf invalid %s ()\n $@ expect + test-dump-cache-tree | \ + sed -n -e s/$_x40/SHA/ -e s/[0-9]* subtrees//g -e '/#(ref)/d' -e '/^invalid /p' actual You only show lines that begin with invalid

Re: [PATCH v5 4/4] cache-tree: Write updated cache-tree after commit

David Turner dtur...@twopensource.com writes: @@ -16,8 +16,26 @@ cmp_cache_tree () { # We don't bother with actually checking the SHA1: # test-dump-cache-tree already verifies that all existing data is # correct. -test_shallow_cache_tree () { - printf SHA (%d entries, 0 subtrees)\n

Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit

Duy Nguyen pclo...@gmail.com writes: ... I know the index_file in prepare_to_commit() is probably index.lock or something, but that does not stop us from locking again (index.lock.lock) if we want to update it. We grabbed the lock on the real index and we have written out the result of

Re: [PATCH v20 00/48] Use ref transactions

Michael Haggerty mhag...@alum.mit.edu writes: Patches 01-19 -- ACK mhagger Patches 20-42 -- I sent various comments, small to large, concerning these patches Patch 43 -- Needs more justification if it is to be acceptable Patch 44 -- Depends on 43 Patches 45-48 -- I didn't quite get to

Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit

Duy Nguyen pclo...@gmail.com writes: Writing cache tree early in prepare_index() does help hooks, but I would say hooks are uncommon case and we could add an option to update-index to explicitly rebuild cache-tree, then hooks that do diff a lot (or other operations that use cache-tree) could

Re: [PATCH 2/2] t/Makefile: always test all lint targets when running tests

Am 07.07.2014 20:13, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Only the two targets test-lint-duplicates and test-lint-executable are currently executed when running the test target. This was done on purpose when the TEST_LINT variable was added in 81127d74. But as

Re: [PATCH 00/14] Add submodule test harness

Am 07.07.2014 21:40, schrieb Torsten Bögershausen: On 2014-07-07 19.05, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Junio, do you want me to resend 02/14 without the non-portable echo -n or could you just squash the following diff in? Amended locally here already; thanks,

Re: [PATCH v2 3/4] use new config API for worktree configurations of submodules

Heiko Voigt hvo...@hvoigt.net writes: diff --git a/builtin/checkout.c b/builtin/checkout.c index 07cf555..03ea20d 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -18,6 +18,7 @@ #include xdiff-interface.h #include ll-merge.h #include resolve-undo.h +#include

Re: [PATCH 00/14] Add submodule test harness

On 08/07/14 20:34, Jens Lehmann wrote: Am 07.07.2014 21:40, schrieb Torsten Bögershausen: On 2014-07-07 19.05, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Junio, do you want me to resend 02/14 without the non-portable echo -n or could you just squash the following diff in?

Re: [PATCH RFC v2 01/19] rebase -i: Failed reword prints redundant error message

Fabian Ruch baf...@gmail.com writes: The to-do list command `reword` replays a commit like `pick` but lets the user also edit the commit's log message. If the edited log message is empty or is found ill-formatted by one of the commit hooks, git-rebase--interactive prints three error messages

Re: [PATCH RFC v2 02/19] rebase -i: reword complains about empty commit despite --keep-empty

Fabian Ruch baf...@gmail.com writes: Subject: rebase -i: reword complains about empty commit despite --keep-empty I had to read the title and then the log twice before understanding that the above is not change the complaint message (i.e. reword complaints spelled incorrectly) but is a

Re: [PATCH RFC v2 03/19] rebase -i: reword executes pre-commit hook on interim commit

Fabian Ruch baf...@gmail.com writes: The to-do list command `reword` replays a commit like `pick` but lets the user also edit the commit's log message. This happens in two steps. Firstly, the named commit is cherry-picked. Secondly, the commit created in the first step is amended using an

[PATCH] gitk: add keybinding to switch to parent commit

Signed-off-by: Max Kirillov m...@max630.net --- Hi. I was missing this one. Actually the most needed is go to first parent, though the second also may be useful. gitk | 12 1 file changed, 12 insertions(+) diff --git a/gitk b/gitk index 41e5071..de35fe4 100755 --- a/gitk +++ b/gitk

Re: [PATCH RFC v2 00/19] Enable options --signoff, --reset-author for pick, reword

Fabian Ruch baf...@gmail.com writes: Fabian Ruch (19): rebase -i: Failed reword prints redundant error message rebase -i: reword complains about empty commit despite --keep-empty rebase -i: reword executes pre-commit hook on interim commit rebase -i: Teach do_pick the option --edit

Re: [PATCH 00/14] Add submodule test harness

On 08/07/14 21:25, Ramsay Jones wrote: On 08/07/14 20:34, Jens Lehmann wrote: Am 07.07.2014 21:40, schrieb Torsten Bögershausen: On 2014-07-07 19.05, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Junio, do you want me to resend 02/14 without the non-portable echo -n or

Re: [PATCH] log: fix indentation for --graph --show-signature

On Tue, Jul 8, 2014 at 7:12 AM, Zoltan Klinger zoltan.klin...@gmail.com wrote: The git log --graph --show-signature command incorrectly indents the gpg information about signed commits and merged signed tags. It does not follow the level of indentation of the current commit. Reported-by:

What's cooking in git.git (Jul 2014, #01; Tue, 8)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH] http: Add Accept-Language header if possible

On Tue, Jul 8, 2014 at 11:54 AM, Yi EungJun semtlen...@gmail.com wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by 'LANGUAGE' environment variable if the variable is not empty. Example: LANGUAGE= -

Re: [PATCH RFC v2 06/19] rebase -i: Stop on root commits with empty log messages

Fabian Ruch baf...@gmail.com writes: The command line used to recreate root commits specifies the erroneous option `--allow-empty-message`. If the root commit has an empty log message, the replay of this commit should fail and the rebase should be interrupted like for any other commit that is

Re: [PATCH RFC v2 07/19] rebase -i: The replay of root commits is not shown with --verbose

Fabian Ruch baf...@gmail.com writes: The command line used to recreate root commits specifies the erroneous option `-q` which suppresses the commit summary message. However, git-rebase--interactive tends to tell the user about the commits it creates, if she wishes (cf. command line option

Re: [PATCH RFC v2 08/19] rebase -i: Root commits are replayed with an unnecessary option

Fabian Ruch baf...@gmail.com writes: The command line used to recreate root commits specifies the effectless option `-C`. It is used to reuse commit message and authorship from the named commit but the commit being amended here, which is the sentinel commit, already carries the authorship and

Re: t5150-request-pull.sh fails on newest master in Debian

On 3 July 2014 23:55, Øyvind A. Holm su...@sunbase.org wrote: When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5 (64-bit), t5150-request-pull.sh fails when compiling with $ make configure $ ./configure --prefix=/usr/local/varprg/git.master.v2.0.1-472-g6f92e5f $ make

Re: t5150-request-pull.sh fails on newest master in Debian

On Wed, 2014-07-09 at 02:52 +0200, Øyvind A. Holm wrote: On 3 July 2014 23:55, Øyvind A. Holm su...@sunbase.org wrote: When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5 (64-bit), t5150-request-pull.sh fails when compiling with $ make configure $ ./configure

Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit

On Wed, Jul 9, 2014 at 12:05 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: I wonder if we need to update_main_cache_tree() so many times in this function. If I read the code correctly, all roads must lead to update_main_cache_tree(0) in prepare_to_commit().

[PATCH v2] log: fix indentation for --graph --show-signature

The git log --graph --show-signature command incorrectly indents the gpg information about signed commits and merged signed tags. It does not follow the level of indentation of the current commit. Example of garbled output: $ git log --show-signature --graph * commit

Re: [PATCH v20 00/48] Use ref transactions

On Tue, Jul 08, 2014 at 11:48:06AM -0700, Junio C Hamano wrote: I'd say that if you have foo/bar you cannot have foo may have started as an implementation limitation, but the interoperability requirement with existing versions of Git and with existing repositories makes it necessary to

Re: [PATCH] http: Add Accept-Language header if possible

On Wed, Jul 09, 2014 at 12:54:06AM +0900, Yi EungJun wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by 'LANGUAGE' environment variable if the variable is not empty. Example: LANGUAGE= -

Re: Branch list by date

On Mon, Jul 07, 2014 at 09:54:55PM -0700, Jeremy Apthorp wrote: I write this missive with dual purpose: firstly to share a potentially useful tool, and secondly to suggest that this feature (with a less mind-wrenchingly disgusting implementation) might be included in mainline git, as for

Re: [PATCH 2/2] t/Makefile: always test all lint targets when running tests

On Mon, Jul 07, 2014 at 11:13:11AM -0700, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Only the two targets test-lint-duplicates and test-lint-executable are currently executed when running the test target. This was done on purpose when the TEST_LINT variable was added

Re: [PATCH 2/2] dir: remove PATH_MAX limitation

On Sat, Jul 05, 2014 at 12:42:29AM +0200, Karsten Blees wrote: Note: this fix just 'abuses' strbuf as string allocator, len is always 0. prep_exclude() can probably be simplified using more strbuf APIs. Hrm. It looks like you grow it and add some data, but really don't want the length to

Re: [PATCH 2/2] t/Makefile: always test all lint targets when running tests

On Tue, Jul 8, 2014 at 12:24 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 07.07.2014 20:13, schrieb Junio C Hamano: So I am not very enthusiastic to see this change myself. Ok, I understand we do not want to lightly risk false positives. I just noticed that I accidentally forgot to sign

Re: [PATCH] http: Add Accept-Language header if possible

2014-07-09 14:10 GMT+09:00 Jeff King p...@peff.net: On Wed, Jul 09, 2014 at 12:54:06AM +0900, Yi EungJun wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by 'LANGUAGE' environment variable if the variable is