[PATCH] Remove inadvertently added outgoing/packfile.h

2017-08-28 Thread Jonathan Tan
This empty file was inadvertently introduced in commit 4f39cd8 ("pack: move pack name-related functions", 2017-08-23). Remove this file. Signed-off-by: Jonathan Tan --- outgoing/packfile.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644

Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-08-28 Thread Ben Peart
On 8/28/2017 4:28 PM, Kevin Willford wrote: The code was using two string_lists, one for the directories and one for the files. The code never checks the lists independently so we should be able to only use one list. The string_list also is a O(log n) for lookup and insertion. Switching

Re: [PATCH 2/3] merge-recursive: remove return value from get_files_dirs

2017-08-28 Thread Ben Peart
On 8/28/2017 4:28 PM, Kevin Willford wrote: The return value of the get_files_dirs call is never being used. Looking at the history of the file and it was originally only being used for debug output statements. Also when read_tree_recursive return value is non zero it is changed to zero.

Re: [PATCH 1/3] merge-recursive: fix memory leak

2017-08-28 Thread Ben Peart
On 8/28/2017 4:28 PM, Kevin Willford wrote: In merge_trees if process_renames or process_entry returns less than zero, the method will just return and not free re_merge, re_head, or entries. This change cleans up the allocated variables before returning to the caller. Signed-off-by: Kevin

Re: [PATCH] Add t/helper/test-write-cache to .gitignore

2017-08-28 Thread Brandon Williams
On 08/28, Jonathan Tan wrote: > This new binary was introduced in commit 3921a0b ("perf: add test for > writing the index", 2017-08-21), but a .gitignore entry was not added > for it. Add that entry. > > Signed-off-by: Jonathan Tan Looks good to me > --- >

Re: [PATCH v2 0/4] Some ThreadSanitizer-results

2017-08-28 Thread Jeff Hostetler
On 8/21/2017 1:43 PM, Martin Ågren wrote: This is the second version of my series to try to address some issues ... 2) hashmap_add, which I could try my hands on if Jeff doesn't beat me to it -- his proposed change should fix it and I doubt I could come up with anything "better", considering

[PATCH v2 2/2] refs/files-backend: fix memory leak in lock_ref_for_update

2017-08-28 Thread Martin Ågren
After the previous patch, none of the functions we call hold on to `referent.buf`, so we can safely release the string buffer before returning. Signed-off-by: Martin Ågren --- refs/files-backend.c | 31 --- 1 file changed, 20 insertions(+), 11

[PATCH v2 1/2] refs/files-backend: add longer-scoped copy of string to list

2017-08-28 Thread Martin Ågren
split_symref_update() receives a string-pointer `referent` and adds it to the list of `affected_refnames`. The list simply holds on to the pointers it is given, it does not copy the strings and it never frees them. The `referent` string in split_symref_update() belongs to a string buffer in the

[PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-08-28 Thread Kevin Willford
The code was using two string_lists, one for the directories and one for the files. The code never checks the lists independently so we should be able to only use one list. The string_list also is a O(log n) for lookup and insertion. Switching this to use a hashmap will give O(1) which will

[PATCH 2/3] merge-recursive: remove return value from get_files_dirs

2017-08-28 Thread Kevin Willford
The return value of the get_files_dirs call is never being used. Looking at the history of the file and it was originally only being used for debug output statements. Also when read_tree_recursive return value is non zero it is changed to zero. This leads me to believe that it doesn't matter if

[PATCH 0/3] merge-recursive: replace string_list with hashmap

2017-08-28 Thread Kevin Willford
Code was using two string_lists, one for the directories and one for the files. The code never checks the lists independently so we should be able to only use one list. The string_list also is a O(log n) for lookup and insertion. Switching this to use a hashmap will give O(1) which will save

[PATCH 1/3] merge-recursive: fix memory leak

2017-08-28 Thread Kevin Willford
In merge_trees if process_renames or process_entry returns less than zero, the method will just return and not free re_merge, re_head, or entries. This change cleans up the allocated variables before returning to the caller. Signed-off-by: Kevin Willford ---

[PATCH] Add t/helper/test-write-cache to .gitignore

2017-08-28 Thread Jonathan Tan
This new binary was introduced in commit 3921a0b ("perf: add test for writing the index", 2017-08-21), but a .gitignore entry was not added for it. Add that entry. Signed-off-by: Jonathan Tan --- t/helper/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git

Re: [PATCH v5 35/40] Add Documentation/technical/external-odb.txt

2017-08-28 Thread Ben Peart
On 8/3/2017 5:19 AM, Christian Couder wrote: This describes the external odb mechanism's purpose and how it works. Helped-by: Ben Peart Signed-off-by: Christian Couder --- Documentation/technical/external-odb.txt | 295

Re: git describe and "the smallest number of commits possible"

2017-08-28 Thread Stefan Beller
On Sat, Aug 26, 2017 at 7:47 AM, Kévin Le Gouguec wrote: > Hi, > > I've asked this question on the git-users Google Groups list[1], and > while the answers there were interesting, I still cannot figure > whether my problem comes from an actual bug, a misleading manpage,

Re: [PATCH] pkt-line: re-'static'-ify buffer in packet_write_fmt_1()

2017-08-28 Thread Jeff King
On Mon, Aug 28, 2017 at 10:52:51AM -0700, Stefan Beller wrote: > >> I'm curious, too. I don't think the valgrind setup in our test suite is > >> great for finding leaks right now. > > This discussion comes up every once in a while, > the last time I was involved in this discussion I proposed >

Re: Automatically delete branches containing accepted patches?

2017-08-28 Thread Jeff King
On Sun, Aug 27, 2017 at 08:44:06PM +0200, Lars Schneider wrote: > I have lots of git/git branches and once in a while some patches make it > into git/git master. If this happens I would like to delete my branch > with the patch automatically. That's not easily possible as the hashes > on my

Re: [PATCH] pkt-line: re-'static'-ify buffer in packet_write_fmt_1()

2017-08-28 Thread Stefan Beller
>>> No mention of "pkt-line.c". Did you run Git with valgrind on one of >>> your repositories to find it? >> >> I'm curious, too. I don't think the valgrind setup in our test suite is >> great for finding leaks right now. > This discussion comes up every once in a while, the last time I was

Re: Automatically delete branches containing accepted patches?

2017-08-28 Thread Stefan Beller
On Sun, Aug 27, 2017 at 11:44 AM, Lars Schneider wrote: > Hi, > > I have lots of git/git branches and once in a while some patches make it > into git/git master. If this happens I would like to delete my branch > with the patch automatically. That's not easily possible

Re: ignoring extra bitmap file?

2017-08-28 Thread Andreas Krey
On Fri, 18 Aug 2017 02:53:34 +, Jeff King wrote: ... > Whether there's a .bitmap doesn't impact whether .pack and .idx files > are deleted. The next full repack would pack everything into a new big > pack, and then delete any existing files, including .pack, .idx, and > .bitmap. It took a bit

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

2017-08-28 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 v4 2/4] submodule--helper: introduce for_each_listed_submodule()

2017-08-28 Thread Prathamesh Chavan
Introduce function for_each_listed_submodule() 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

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

2017-08-28 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 v4 3/4] submodule: port set_name_rev() from shell to C

2017-08-28 Thread Prathamesh Chavan
Function set_name_rev() is ported from git-submodule to the submodule--helper builtin. The function compute_rev_name() generates the value of the revision name as required. The function get_rev_name() calls compute_rev_name() and receives the revision name, and later handles its formating and

[GSoC][PATCH v4 0/4] Incremental rewrite of git-submodules

2017-08-28 Thread Prathamesh Chavan
Changes in v4: * The patches were adjusted to recent codebase. Also, the gitmodules_config() was call was removed from the functions module_init() and module_status() which was essential after the merge of the branch bw/submodule-config-cleanup. Since it was mentioned earlier, I even

[no subject]

2017-08-28 Thread Martins Laurence
Hello Dear I am Martins Laurence from Republic of Togo, i contact you for a private legal business deal worth of $10.5Million i would like you to contact my private email below for more details Contact my private email address (martinslaurenc...@gmail.com) Am expecting your response Martins

FOR YOUR KIND CONSIDERATION.

2017-08-28 Thread casmire.ker...@ono.com
Compliment of the day, How is your day. I am Mrs. Siti Zakaiah from Malaysia, I am writing to let know you that,I am a widow and get amount of $5.3M buisness proposed for you. Please if you are willing and ready, kindly write to me on this private email id (siti.zakaia...@gmail.com) Mrs. Siti

FOR YOUR KIND CONSIDERATION.

2017-08-28 Thread casmire.ker...@ono.com
Compliment of the day, How is your day. I am Mrs. Siti Zakaiah from Malaysia, I am writing to let know you that,I am a widow and get amount of $5.3M buisness proposed for you. Please if you are willing and ready, kindly write to me on this private email id (siti.zakaia...@gmail.com) Mrs. Siti

Re: [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames

2017-08-28 Thread Martin Ågren
On 28 August 2017 at 10:06, Michael Haggerty wrote: > On Sat, Aug 26, 2017 at 12:16 PM, Martin Ågren wrote: >> On 25 August 2017 at 23:00, Junio C Hamano wrote: >>> Martin Ågren writes: >>>

Re: [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames

2017-08-28 Thread Michael Haggerty
On Sat, Aug 26, 2017 at 12:16 PM, Martin Ågren wrote: > On 25 August 2017 at 23:00, Junio C Hamano wrote: >> Martin Ågren writes: >> >>> files_transaction_prepare() and the functions it calls add strings to a >>> string list

Re: Automatically delete branches containing accepted patches?

2017-08-28 Thread Nicolas Morey-Chaisemartin
You could rebase your branches onto the upstream branch. Once all the patches are in, the SHA1 of the rebased branch is somewhere in the history of the upstream master. I use a set of scripts I've written to handle multiple branches: https://github.com/nmorey/git-topic-branches Using namesapce

Re: Automatically delete branches containing accepted patches?

2017-08-28 Thread Jacob Keller
On Sun, Aug 27, 2017 at 11:44 AM, Lars Schneider wrote: > Hi, > > I have lots of git/git branches and once in a while some patches make it > into git/git master. If this happens I would like to delete my branch > with the patch automatically. That's not easily possible

Re: [PATCH 02/12] load_subtree(): remove unnecessary conditional

2017-08-28 Thread Michael Haggerty
Junio, I'm surprised that you have merged the `mh/notes-cleanup` branch into `next` already. Was that intentional? Aside from the fact that the topic has had very little cooking time, there's the issue of the assertion that you asked for. I have implemented the assertion in a new version of the