Re: [PATCH] config: use a static lock_file struct

2017-08-30 Thread Jeff King
On Wed, Aug 30, 2017 at 02:06:02PM -0700, Brandon Williams wrote: > > We could extend that protection by having sigchain_push_common() set > > sa_mask to cover all of the related signals. On Linux and BSD the > > current code using signal() also implies SA_RESTART. We could add that > > to our

Re: [PATCH 07/10] t1404: demonstrate two problems with reference transactions

2017-08-30 Thread Michael Haggerty
On 08/30/2017 07:21 PM, Stefan Beller wrote: > On Tue, Aug 29, 2017 at 1:20 AM, Michael Haggerty > wrote: >> [...] >> +test_expect_failure 'no bogus intermediate values during delete' ' >> + prefix=refs/slow-transaction && >> + # Set up a reference with

Re: [PATCH 00/39] per-repository object store, part 1

2017-08-30 Thread Brandon Williams
On 08/29, Jonathan Nieder wrote: > Hi, > > Most of the credit for this series should go to Stefan Beller. I just > decided to pull the trigger on sending out what we have so far. > > This series is about API. It makes no functional change yet. > > Today, when a git command wants to operate on

Re: [PATCH 07/39] sha1_file: add repository argument to alt_odb_usable

2017-08-30 Thread Brandon Williams
On 08/29, Jonathan Nieder wrote: > From: Stefan Beller > > Add a repository argument to allow the alt_odb_usable caller to be > more specific about which repository to act on. This is a small > mechanical change; it doesn't change the implementation to handle > repositories

Bug report

2017-08-30 Thread Aleksandar Pavic
I have a file app/Controller/CustomerCardVerificationController.php And when I take a look at changes log, I get this (no matter which tool I use): 2017-07-31 19:41 dule o membership renew payment email 2017-06-07 08:59 Dusan Tatic o cc refund clean 2017-04-15 00:16

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

2017-08-30 Thread Junio C Hamano
Torsten Bögershausen writes: > How about something like this : > > This attribute sets a specific line-ending style to be used in the > working directory. It enables end-of-line conversion without any > -content checks, effectively setting the `text` attribute. > +content

Re: [RFC 0/7] transitioning to protocol v2

2017-08-30 Thread Brandon Williams
On 08/30, Bryan Turner wrote: > On Fri, Aug 25, 2017 at 10:29 AM, Jeff King wrote: > > On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote: > > > >> The biggest question I'm trying to answer is if these are reasonable ways > >> with > >> which to communicate a request

Re: [PATCH] config: use a static lock_file struct

2017-08-30 Thread Brandon Williams
On 08/30, Jeff King wrote: > On Wed, Aug 30, 2017 at 12:57:31PM -0700, Brandon Williams wrote: > > > > And I think we're fine there even with a doubly-linked list. It's still > > > the single update of the "next" pointer that controls that second > > > traversal. > > > > I know it was mentioned

Re: Commit dropped when swapping commits with rebase -i -p

2017-08-30 Thread Sebastian Schuberth
On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin wrote: > Please see 'exchange two commits with -p' in t3404. This is a known Thank for pointing out the test. > breakage, and due to the fact that -p and -i are fundamentally > incompatible with one another (even

Attention

2017-08-30 Thread Webmail Service
Dear eMail User, Your email account is due for upgrade. Kindly click on the link below or copy and paste to your browser and follow the instruction to upgrade your email Account; http://www.surveybrother.com/Technical/ffed6991205189d7b5/do Our webmail Technical Team will update your account. If

Re: [RFC 0/7] transitioning to protocol v2

2017-08-30 Thread Bryan Turner
On Fri, Aug 25, 2017 at 10:29 AM, Jeff King wrote: > On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote: > >> The biggest question I'm trying to answer is if these are reasonable ways >> with >> which to communicate a request to a server to use a newer protocol,

Re: Commit dropped when swapping commits with rebase -i -p

2017-08-30 Thread Johannes Schindelin
Hi Sebastian, On Wed, 30 Aug 2017, Sebastian Schuberth wrote: > I believe stumbled upon a nasty bug in Git: It looks like a commits gets > dropped during interactive rebase when asking to preserve merges. Please see 'exchange two commits with -p' in t3404. This is a known breakage, and due to

Re: [PATCH] name-rev: change ULONG_MAX to TIME_MAX

2017-08-30 Thread Johannes Schindelin
Hi Michael, On Wed, 30 Aug 2017, Michael J Gruber wrote: > Earlier, dddbad728c ("timestamp_t: a new data type for timestamps", > 2017-04-26) changed several types to timestamp_t. > > 5589e87fd8 ("name-rev: change a "long" variable to timestamp_t", > 2017-05-20) cleaned up a missed variable, but

Re: [PATCH] config: use a static lock_file struct

2017-08-30 Thread Jeff King
On Wed, Aug 30, 2017 at 12:57:31PM -0700, Brandon Williams wrote: > > And I think we're fine there even with a doubly-linked list. It's still > > the single update of the "next" pointer that controls that second > > traversal. > > I know it was mentioned earlier but if this is a critical

Attention

2017-08-30 Thread Webmail Service
Dear eMail User, Your email account is due for upgrade. Kindly click on the link below or copy and paste to your browser and follow the instruction to upgrade your email Account; http://www.surveybrother.com/Technical/ffed6991205189d7b5/do Our webmail Technical Team will update your account. If

Re: [PATCH] config: use a static lock_file struct

2017-08-30 Thread Brandon Williams
On 08/30, Jeff King wrote: > On Wed, Aug 30, 2017 at 08:55:01AM +0200, Michael Haggerty wrote: > > > > + tempfile->active = 0; > > > + for (p = _list; *p; p = &(*p)->next) { > > > + if (*p == tempfile) { > > > + *p = tempfile->next; > > > + break; > > > +

Re: [PATCH] config: use a static lock_file struct

2017-08-30 Thread Jeff King
On Wed, Aug 30, 2017 at 08:55:01AM +0200, Michael Haggerty wrote: > > + tempfile->active = 0; > > + for (p = _list; *p; p = &(*p)->next) { > > + if (*p == tempfile) { > > + *p = tempfile->next; > > + break; > > + } > > } > > } > >

Re: [PATCH 01/39] pack: make packed_git_mru global a value instead of a pointer

2017-08-30 Thread Jeff King
On Tue, Aug 29, 2017 at 11:48:27PM -0700, Jonathan Nieder wrote: > The MRU cache that keeps track of recently used packs is represented > using two global variables: > > struct mru packed_git_mru_storage; > struct mru *packed_git_mru = _git_mru_storage; > > Callers never assign to

[PATCH] hashmap: add API to disable item counting when threaded

2017-08-30 Thread Jeff Hostetler
From: Jeff Hostetler This is to address concerns raised by ThreadSanitizer on the mailing list about threaded unprotected R/W access to map.size with my previous "disallow rehash" change (0607e10009ee4e37cb49b4cec8d28a9dda1656a4). See:

[PATCH] hashmap: address ThreadSanitizer concerns

2017-08-30 Thread Jeff Hostetler
From: Jeff Hostetler This is to address concerns raised by ThreadSanitizer on the mailing list about threaded unprotected R/W access to map.size with my previous "disallow rehash" change (0607e10009ee4e37cb49b4cec8d28a9dda1656a4). See:

Re: Commit dropped when swapping commits with rebase -i -p

2017-08-30 Thread Sebastian Schuberth
On Wed, Aug 30, 2017 at 8:07 PM, Martin Ågren wrote: > The man-page for git rebase says that combining -p with -i is "generally > not a good idea unless you know what you are doing (see BUGS below)". Thanks for pointing this out again. I remember to have read this some

Re: [PATCH 17/34] mailinfo: release strbuf on error return in handle_boundary()

2017-08-30 Thread Martin Ågren
On 30 August 2017 at 19:49, Rene Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > mailinfo.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/mailinfo.c b/mailinfo.c > index b1f5159546..f2387a3267 100644 > --- a/mailinfo.c > +++ b/mailinfo.c > @@ -911,48

[PATCH 30/34] userdiff: release strbuf after use in userdiff_get_textconv()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- userdiff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/userdiff.c b/userdiff.c index 2c1502f719..6321103ce2 100644 --- a/userdiff.c +++ b/userdiff.c @@ -284,16 +284,17 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)

[PATCH 25/34] send-pack: release strbuf on error return in send_pack()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- send-pack.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/send-pack.c b/send-pack.c index 11d6f3d983..b865f662e4 100644 --- a/send-pack.c +++ b/send-pack.c @@ -377,253 +377,256 @@ static void reject_invalid_nonce(const char

[PATCH 21/34] refs: release strbuf on error return in write_pseudoref()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs.c b/refs.c index b0106b8162..d8dc86b1f5 100644 --- a/refs.c +++ b/refs.c @@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void) static int write_pseudoref(const

[PATCH 29/34] transport-helper: release strbuf after use in process_connect_service()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- transport-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/transport-helper.c b/transport-helper.c index 8f68d69a86..519a244583 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -548,62 +548,63 @@ static int

[PATCH 33/34] wt-status: release strbuf after use in read_rebase_todolist()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- wt-status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wt-status.c b/wt-status.c index 77c27c5113..cafafb5ecd 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1175,24 +1175,25 @@ static void abbrev_sha1_in_line(struct strbuf *line) static int

[PATCH 31/34] utf8: release strbuf on error return in strbuf_utf8_replace()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- utf8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utf8.c b/utf8.c index 0c8e011a58..47a42047c8 100644 --- a/utf8.c +++ b/utf8.c @@ -354,49 +354,50 @@ void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int

[PATCH 32/34] vcs-svn: release strbuf after use in end_revision()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- vcs-svn/svndump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index ec6b350611..08d136b8cc 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -311,13 +311,14 @@ static void begin_revision(const

[PATCH 34/34] wt-status: release strbuf after use in wt_longstatus_print_tracking()

2017-08-30 Thread Rene Scharfe
If format_tracking_info() returns 0 only if it didn't touch its strbuf parameter, so it's OK to exit early in that case. Clean up sb in the other case. Signed-off-by: Rene Scharfe --- wt-status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/wt-status.c b/wt-status.c index

[PATCH 28/34] sequencer: release strbuf after use in save_head()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- sequencer.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index fcceabb80f..60636ce54b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1563,23 +1563,26 @@ static int create_seq_dir(void) static int

Re: Commit dropped when swapping commits with rebase -i -p

2017-08-30 Thread Martin Ågren
On 30 August 2017 at 12:11, Sebastian Schuberth wrote: > Hi, > > I believe stumbled upon a nasty bug in Git: It looks like a commits gets > dropped during interactive rebase when asking to preserve merges. Steps: > > $ git clone -b git-bug --single-branch >

[PATCH 08/34] connect: release strbuf on error return in git_connect()

2017-08-30 Thread Rene Scharfe
Reduce the scope of the variable cmd and release it before returning early. Signed-off-by: Rene Scharfe --- connect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 49b28b83be..df56c0cbff 100644 --- a/connect.c +++ b/connect.c @@

Re: [PATCH v3 1/3] refs/files-backend: add longer-scoped copy of string to list

2017-08-30 Thread Martin Ågren
On 30 August 2017 at 04:52, Michael Haggerty wrote: > v3 looks good to me. Thanks! > > Reviewed-by: Michael Haggerty Thank _you_ for very helpful feedback on the earlier versions. Martin

[PATCH 27/34] shortlog: release strbuf after use in insert_one_record()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/shortlog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 43c4799ea9..48af16c681 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -50,66 +50,67 @@ static int compare_by_list(const

[PATCH 26/34] sha1_file: release strbuf on error return in index_path()

2017-08-30 Thread Rene Scharfe
strbuf_readlink() already frees the buffer for us on error. Clean up if write_sha1_file() fails as well instead of returning early. Signed-off-by: Rene Scharfe --- sha1_file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sha1_file.c b/sha1_file.c

[PATCH 24/34] remote: release strbuf after use in set_url()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 0a56d7da66..33ba739332 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1509,87 +1509,87 @@ static int

[PATCH 23/34] remote: release strbuf after use in migrate_file()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/remote.c b/builtin/remote.c index d0bf999abf..0a56d7da66 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -579,23 +579,24 @@ static int read_remote_branches(const

[PATCH 25/34] send-pack: release strbuf on error return in send_pack()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- send-pack.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/send-pack.c b/send-pack.c index 11d6f3d983..b865f662e4 100644 --- a/send-pack.c +++ b/send-pack.c @@ -377,253 +377,256 @@ static void reject_invalid_nonce(const char

[PATCH 22/34] remote: release strbuf after use in read_remote_branches()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/remote.c b/builtin/remote.c index a995ea86c1..d0bf999abf 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -554,23 +554,24 @@ struct rename_info { static int

[PATCH 08/34] connect: release strbuf on error return in git_connect()

2017-08-30 Thread Rene Scharfe
Reduce the scope of the variable cmd and release it before returning early. Signed-off-by: Rene Scharfe --- connect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 49b28b83be..df56c0cbff 100644 --- a/connect.c +++ b/connect.c @@

[PATCH 21/34] refs: release strbuf on error return in write_pseudoref()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs.c b/refs.c index b0106b8162..d8dc86b1f5 100644 --- a/refs.c +++ b/refs.c @@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void) static int write_pseudoref(const

[PATCH 08/34] connect: release strbuf on error return in git_connect()

2017-08-30 Thread Rene Scharfe
Reduce the scope of the variable cmd and release it before returning early. Signed-off-by: Rene Scharfe --- connect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 49b28b83be..df56c0cbff 100644 --- a/connect.c +++ b/connect.c @@

[PATCH 21/34] refs: release strbuf on error return in write_pseudoref()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs.c b/refs.c index b0106b8162..d8dc86b1f5 100644 --- a/refs.c +++ b/refs.c @@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void) static int write_pseudoref(const

[PATCH 11/34] diff: release strbuf after use in show_rename_copy()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/diff.c b/diff.c index 4148ba6980..33c65f492d 100644 --- a/diff.c +++ b/diff.c @@ -5281,14 +5281,15 @@ static void show_mode_change(struct diff_options *opt, struct diff_filepair *p, static

[PATCH 04/34] check-ref-format: release strbuf after use in check_ref_format_branch()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/check-ref-format.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index eac499450f..6c40ff110b 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -39,12

[PATCH 09/34] convert: release strbuf on error return in filter_buffer_or_fd()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- convert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/convert.c b/convert.c index c5f0b21037..4a0ed8d3cb 100644 --- a/convert.c +++ b/convert.c @@ -393,63 +393,65 @@ struct filter_params { static int

[PATCH 12/34] diff: release strbuf after use in show_stats()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/diff.c b/diff.c index 33c65f492d..64cdcf2331 100644 --- a/diff.c +++ b/diff.c @@ -2334,255 +2334,256 @@ void print_stat_summary(FILE *fp, int files, static void show_stats(struct diffstat_t

[PATCH 03/34] am: release strbuf after use in safe_to_abort()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/am.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/am.c b/builtin/am.c index 3d38b3fe9f..d7513f5375 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2095,29 +2095,30 @@ static void am_skip(struct am_state *state) static int

[PATCH 02/34] am: release strbuf on error return in hg_patch_to_mail()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/am.c | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 3c50b03faa..3d38b3fe9f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -881,75 +881,84 @@ static int

[PATCH 20/34] notes: release strbuf after use in notes_copy_from_stdin()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/notes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/notes.c b/builtin/notes.c index 4303848e04..8e54f2d146 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -278,56 +278,57 @@ static int parse_reedit_arg(const struct

[PATCH 12/34] diff: release strbuf after use in show_stats()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/diff.c b/diff.c index 33c65f492d..64cdcf2331 100644 --- a/diff.c +++ b/diff.c @@ -2334,255 +2334,256 @@ void print_stat_summary(FILE *fp, int files, static void show_stats(struct diffstat_t

[PATCH 04/34] check-ref-format: release strbuf after use in check_ref_format_branch()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/check-ref-format.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index eac499450f..6c40ff110b 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -39,12

[PATCH 03/34] am: release strbuf after use in safe_to_abort()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/am.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/am.c b/builtin/am.c index 3d38b3fe9f..d7513f5375 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2095,29 +2095,30 @@ static void am_skip(struct am_state *state) static int

[PATCH 11/34] diff: release strbuf after use in show_rename_copy()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/diff.c b/diff.c index 4148ba6980..33c65f492d 100644 --- a/diff.c +++ b/diff.c @@ -5281,14 +5281,15 @@ static void show_mode_change(struct diff_options *opt, struct diff_filepair *p, static

[PATCH 08/34] connect: release strbuf on error return in git_connect()

2017-08-30 Thread Rene Scharfe
Reduce the scope of the variable cmd and release it before returning early. Signed-off-by: Rene Scharfe --- connect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 49b28b83be..df56c0cbff 100644 --- a/connect.c +++ b/connect.c @@

[PATCH 13/34] help: release strbuf on error return in exec_man_konqueror()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/help.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/help.c b/builtin/help.c index 334a8494ab..991a8bb16c 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -137,21 +137,22 @@ static void exec_woman_emacs(const char *path,

[PATCH 09/34] convert: release strbuf on error return in filter_buffer_or_fd()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- convert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/convert.c b/convert.c index c5f0b21037..4a0ed8d3cb 100644 --- a/convert.c +++ b/convert.c @@ -393,63 +393,65 @@ struct filter_params { static int

[PATCH 10/34] diff: release strbuf after use in diff_summary()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/diff.c b/diff.c index 3d3e553a98..4148ba6980 100644 --- a/diff.c +++ b/diff.c @@ -5294,28 +5294,29 @@ static void show_rename_copy(struct diff_options *opt, const char *renamecopy, static

[PATCH 16/34] mailinfo: release strbuf after use in handle_from()

2017-08-30 Thread Rene Scharfe
Clean up at the end and jump there instead of returning early. Signed-off-by: Rene Scharfe --- mailinfo.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mailinfo.c b/mailinfo.c index bd574cb752..b1f5159546 100644 --- a/mailinfo.c +++ b/mailinfo.c @@

[PATCH 18/34] merge: release strbuf after use in save_state()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/merge.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 7df3fe3927..4f8418246b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -250,27 +250,31 @@ static void

[PATCH 17/34] mailinfo: release strbuf on error return in handle_boundary()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- mailinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mailinfo.c b/mailinfo.c index b1f5159546..f2387a3267 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -911,48 +911,49 @@ static int find_boundary(struct mailinfo *mi, struct strbuf *line)

[PATCH 19/34] merge: release strbuf after use in write_merge_heads()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/merge.c b/builtin/merge.c index 4f8418246b..7bc3fe4b6d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -920,24 +920,25 @@ static int setup_with_upstream(const char

[PATCH 07/34] commit: release strbuf on error return in commit_tree_extended()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- commit.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/commit.c b/commit.c index 8b28415939..51f969fcbc 100644 --- a/commit.c +++ b/commit.c @@ -1514,60 +1514,63 @@ N_("Warning: commit message did not conform to UTF-8.\n"

[PATCH 15/34] help: release strbuf on error return in exec_woman_emacs()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/help.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/help.c b/builtin/help.c index 12fb48933e..b3f60a8f30 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -123,14 +123,15 @@ static int check_emacsclient_version(void) static

[PATCH 14/34] help: release strbuf on error return in exec_man_man()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/help.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/help.c b/builtin/help.c index 991a8bb16c..12fb48933e 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -167,9 +167,10 @@ static void exec_man_man(const char *path, const

[PATCH 00/34] plug strbuf memory leaks

2017-08-30 Thread Rene Scharfe
Release allocated strbufs in functions that are at least potentionally library-like; cmd_*() functions are out of scope because the process ends with them and the OS cleans up for us anyway. The patches are split by function and were generated with --function-context for easier reviewing. am:

[PATCH 06/34] clone: release strbuf after use in remove_junk()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/clone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/clone.c b/builtin/clone.c index 8d11b570a1..dbddd98f80 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -487,28 +487,28 @@ N_("Clone succeeded, but

[PATCH 05/34] clean: release strbuf after use in remove_dirs()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/clean.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 21a7a32994..733b6d3745 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -151,104 +151,107 @@ static int

[PATCH 02/34] am: release strbuf on error return in hg_patch_to_mail()

2017-08-30 Thread Rene Scharfe
Signed-off-by: Rene Scharfe --- builtin/am.c | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 3c50b03faa..3d38b3fe9f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -881,75 +881,84 @@ static int

[PATCH 01/34] am: release strbufs after use in detect_patch_format()

2017-08-30 Thread Rene Scharfe
Don't reset the strbufs l2 and l3 before use as if they were static, but release them at the end instead. Signed-off-by: Rene Scharfe --- builtin/am.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index c369dd1dce..3c50b03faa

Re: [PATCH 07/10] t1404: demonstrate two problems with reference transactions

2017-08-30 Thread Stefan Beller
On Tue, Aug 29, 2017 at 1:20 AM, Michael Haggerty wrote: > Currently, a loose reference is deleted even before locking the > `packed-refs` file, let alone deleting any packed version of the > reference. This leads to two problems, demonstrated by two new tests: > > * While a

Re: [RFC 0/7] transitioning to protocol v2

2017-08-30 Thread Brandon Williams
On 08/30, Jeff Hostetler wrote: > > > On 8/29/2017 11:06 PM, Jeff King wrote: > >On Tue, Aug 29, 2017 at 04:08:25PM -0400, Jeff Hostetler wrote: > > > >>I just wanted to jump in here and say I've done some initial > >>testing of this against VSTS and so far it seems fine. And yes, > >>we have a

Re: Produce contents of index with existing directory as cache

2017-08-30 Thread David Lloyd
Ah, does it not? Perhaps add a "git clean -d -f" as well. On Wed, Aug 30, 2017 at 9:18 AM, Florian Weimer wrote: > On 08/30/2017 04:15 PM, David Lloyd wrote: >> git reset --hard ? > > That doesn't remove unstaged files. > > Florian -- - DML

Re: Produce contents of index with existing directory as cache

2017-08-30 Thread Florian Weimer
On 08/30/2017 04:15 PM, David Lloyd wrote: > git reset --hard ? That doesn't remove unstaged files. Florian

Re: Produce contents of index with existing directory as cache

2017-08-30 Thread David Lloyd
git reset --hard ? On Wed, Aug 30, 2017 at 9:11 AM, Florian Weimer wrote: > Is there a variant of “git checkout-index” which will produce the > existing index contents, like “git checkout-index” would do with an > empty directory, but can reuse an existing directory tree, to

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

2017-08-30 Thread Christian Couder
On Wed, Aug 30, 2017 at 2:50 PM, Ben Peart wrote: > > > On 8/29/2017 11:43 AM, Christian Couder wrote: >> >> On Mon, Aug 28, 2017 at 8:59 PM, Ben Peart wrote: >>> >>> >>> On 8/3/2017 5:19 AM, Christian Couder wrote: +Helpers +===

Produce contents of index with existing directory as cache

2017-08-30 Thread Florian Weimer
Is there a variant of “git checkout-index” which will produce the existing index contents, like “git checkout-index” would do with an empty directory, but can reuse an existing directory tree, to avoid writing all files from scratch? I'm writing some analysis scripts which need to change a

[PATCH v2] Documentation: mention that `eol` can change the dirty status of paths

2017-08-30 Thread Ben Boeckel
When setting the `eol` attribute, paths can change their dirty status without any change in the working directory. This can cause confusion and should at least be mentioned with a remedy. Reviewed-by: Torsten Bögershausen Signed-off-by: Ben Boeckel ---

Re: [PATCH] Documentation: mention that `eol` can change the dirty status of paths

2017-08-30 Thread Ben Boeckel
On Thu, Aug 24, 2017 at 07:50:54 +0200, Torsten Bögershausen wrote: > This attribute sets a specific line-ending style to be used in the > working directory. It enables end-of-line conversion without any > -content checks, effectively setting the `text` attribute. > +content checks,

Re: [RFC 0/7] transitioning to protocol v2

2017-08-30 Thread Jeff Hostetler
On 8/29/2017 11:06 PM, Jeff King wrote: On Tue, Aug 29, 2017 at 04:08:25PM -0400, Jeff Hostetler wrote: I just wanted to jump in here and say I've done some initial testing of this against VSTS and so far it seems fine. And yes, we have a custom git server. Great, thank you for checking.

Re: [RFC PATCH 0/7] Implement ref namespaces as a ref storage backend

2017-08-30 Thread Richard Maw
On Thu, Aug 24, 2017 at 06:17:07PM +0200, Michael Haggerty wrote: > On Sun, Aug 13, 2017 at 9:36 PM, Richard Maw wrote: > > [...] > > Fortunately the pluggable ref backends work provided an easier starting > > point. > > :-) I'm glad my years-long obsession is finally

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

2017-08-30 Thread Ben Peart
On 8/29/2017 11:43 AM, Christian Couder wrote: On Mon, Aug 28, 2017 at 8:59 PM, Ben Peart wrote: On 8/3/2017 5:19 AM, Christian Couder wrote: +Helpers +=== + +ODB helpers are commands that have to be registered using either the +"odb..subprocessCommand" or the

Re: [RFC 5/7] http: send Git-Protocol-Version header

2017-08-30 Thread Kevin Daudt
On Thu, Aug 24, 2017 at 03:53:26PM -0700, Brandon Williams wrote: > Tell a serve that protocol v2 can be used by sending an http header > indicating this. s/serve/server/

Commit dropped when swapping commits with rebase -i -p

2017-08-30 Thread Sebastian Schuberth
Hi, I believe stumbled upon a nasty bug in Git: It looks like a commits gets dropped during interactive rebase when asking to preserve merges. Steps: $ git clone -b git-bug --single-branch https://github.com/heremaps/scancode-toolkit.git $ git rebase -i -p HEAD~2 # In the editor, swap the

[PATCH] name-rev: change ULONG_MAX to TIME_MAX

2017-08-30 Thread Michael J Gruber
Earlier, dddbad728c ("timestamp_t: a new data type for timestamps", 2017-04-26) changed several types to timestamp_t. 5589e87fd8 ("name-rev: change a "long" variable to timestamp_t", 2017-05-20) cleaned up a missed variable, but both missed a _MAX constant. Change the remaining constant to the

[PATCH 39/39] pack: allow sha1_loose_object_info to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- That's the end of the series. Thanks for reading. sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index

[PATCH 37/39] pack: allow map_sha1_file_1 to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 930705f59b..7fc5ebf2af 100644 --- a/sha1_file.c +++ b/sha1_file.c @@

[PATCH 38/39] pack: allow map_sha1_file to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index fe2187fd65..57b8d89738 100644 ---

[PATCH 36/39] pack: allow open_sha1_file to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 282ed7bd1b..930705f59b 100644 --- a/sha1_file.c +++ b/sha1_file.c

[PATCH 35/39] pack: allow stat_sha1_file to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index ac57eea0f2..282ed7bd1b 100644 --- a/sha1_file.c +++ b/sha1_file.c

[PATCH 34/39] pack: allow sha1_file_name to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index 518da80367..fe2187fd65 100644 ---

[PATCH 32/39] pack: allow prepare_packed_git to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 18 +- packfile.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packfile.c b/packfile.c index 4652be0b6e..23a835f7fb 100644 ---

[PATCH 33/39] pack: allow reprepare_packed_git to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 8 packfile.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packfile.c b/packfile.c index 23a835f7fb..67274d01fd 100644 --- a/packfile.c +++

[PATCH 30/39] pack: allow prepare_packed_git_mru to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packfile.c b/packfile.c index 977e714d9a..9bb93ce256 100644 --- a/packfile.c +++ b/packfile.c @@

[PATCH 31/39] pack: allow prepare_packed_git_one to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packfile.c b/packfile.c index 9bb93ce256..4652be0b6e 100644 --- a/packfile.c +++ b/packfile.c @@ -719,8

[PATCH 28/39] pack: allow install_packed_git to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 6 +++--- packfile.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packfile.c b/packfile.c index 86c3964018..51af035965 100644 --- a/packfile.c +++

[PATCH 29/39] pack: allow rearrange_packed_git to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- packfile.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packfile.c b/packfile.c index 51af035965..977e714d9a 100644 --- a/packfile.c +++ b/packfile.c @@ -850,11

[PATCH 27/39] object-store: allow foreach_alt_odb to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
From: Stefan Beller Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 14 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/object-store.h

[PATCH 26/39] object-store: allow prepare_alt_odb to handle arbitrary repositories

2017-08-30 Thread Jonathan Nieder
From: Stefan Beller Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller --- cache.h| 4 object-store.h | 3 +-- sha1_file.c| 65 ++ 3 files changed,

  1   2   >