Re: [PATCH] t4062: stop using repetition in regex

Am 09.08.2017 um 00:26 schrieb Junio C Hamano: > Junio C Hamano writes: > >> So I find Dscho's concern quite valid, even though I do believe you >> when you say the code somehow segfaults. I just can not tell >> how/why it would segfault, though---it is possible that

Re: [PATCH] builtin/add: add a missing newline to an stderr message

Ramsay Jones wrote: > Signed-off-by: Ramsay Jones Reviewed-by: Jonathan Nieder Thanks for catching it.

Re: [PATCH] builtin/add: add a missing newline to an stderr message

Junio C Hamano wrote: > René Scharfe writes: >>> diff --git a/builtin/add.c b/builtin/add.c >>> index e888fb8c5..385b53ae7 100644 >>> --- a/builtin/add.c >>> +++ b/builtin/add.c >>> @@ -43,7 +43,7 @@ static void chmod_pathspec(struct pathspec *pathspec, int >>> force_mode) >>>

Re: [PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

On Tue, Aug 08, 2017 at 03:43:13PM -0700, Junio C Hamano wrote: > > @@ -2812,7 +2812,7 @@ off_t find_pack_entry_one(const unsigned char *sha1, > > hi = mi; > > else > > lo = mi+1; > > - } while (lo < hi); > > + } > > return 0; > > } >

[PATCH] t1200: remove t1200-tutorial.sh

Nowadays there are better tutorials out there such as "Git from bottom up" or others, easily found online. Additionally to that a tutorial in our test suite is not as easy to discover as e.g. online tutorials. This test/tutorial was discovered by the patch author in the effort to migrate our

Re: [PATCH] t1200: remove t1200-tutorial.sh

Hi, Stefan Beller wrote: > Nowadays there are better tutorials out there such as "Git from bottom up" > or others, easily found online. Additionally to that a tutorial in our > test suite is not as easy to discover as e.g. online tutorials. > > This test/tutorial was discovered by the patch

[PATCH] builtin/add: add a missing newline to an stderr message

Signed-off-by: Ramsay Jones --- Hi Junio, I noticed this while looking into the t3700 failure on cygwin tonight. Also, I couldn't decide whether or not to add the i18n '_()' brackets around the message. In the end I didn't, but will happily add them if you think I

Re: [PATCH] builtin/add: add a missing newline to an stderr message

Am 08.08.2017 um 23:36 schrieb Ramsay Jones: > > Signed-off-by: Ramsay Jones > --- > > Hi Junio, > > I noticed this while looking into the t3700 failure on cygwin tonight. > Also, I couldn't decide whether or not to add the i18n '_()' brackets > around the message.

Re: [PATCH] builtin/add: add a missing newline to an stderr message

René Scharfe writes: >> diff --git a/builtin/add.c b/builtin/add.c >> index e888fb8c5..385b53ae7 100644 >> --- a/builtin/add.c >> +++ b/builtin/add.c >> @@ -43,7 +43,7 @@ static void chmod_pathspec(struct pathspec *pathspec, int >> force_mode) >> continue; >>

Re: reftable [v6]: new ref storage format

On Tue, Aug 8, 2017 at 12:25 PM, Junio C Hamano wrote: > Shawn Pearce writes: > >> For `log_type = 0x4..0x7` the `log_chained` section is used instead to >> compress information that already appeared in a prior log record. The >> `log_chained` always

Re: [PATCH] Convert size datatype to size_t

Martin Koegler writes: > From: Martin Koegler > > It changes the signature of the core object access function > including any other functions to assure a clean compile if > sizeof(size_t) != sizeof(unsigned long). > > Signed-off-by: Martin

Re: [PATCH] t4062: stop using repetition in regex

Junio C Hamano writes: > So I find Dscho's concern quite valid, even though I do believe you > when you say the code somehow segfaults. I just can not tell > how/why it would segfault, though---it is possible that regexec() > implementation is stupid and does not realize that

Re: [PATCH] t4062: stop using repetition in regex

Am 09.08.2017 um 00:09 schrieb Junio C Hamano: > René Scharfe writes: > >> Am 08.08.2017 um 16:49 schrieb Johannes Schindelin: >>> Hi René, >>> >>> On Tue, 8 Aug 2017, René Scharfe wrote: >>> OpenBSD's regex library has a repetition limit (RE_DUP_MAX) of 255. That's the

Re: reftable [v6]: new ref storage format

On Tue, Aug 8, 2017 at 12:01 PM, Junio C Hamano wrote: > I notice that you raised the location of restart table within a > block in this iteration (or maybe it happened in v5). > > This forces you to hold all contents in core before the first byte > is written out. You start

Re: [PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

René Scharfe wrote: > find_pack_entry_one() uses the fan-out table of pack indexes to find out > which entries match the first byte of the searched hash and does a > binary search on this subset of the main index table. > > If there are no matching entries then lo and hi will have the same >

Re: [PATCH] t1200: remove t1200-tutorial.sh

Jonathan Nieder wrote: > Stefan Beller wrote: >>> Stefan Beller wrote: Nowadays there are better tutorials out there such as "Git from bottom up" or others, easily found online. Additionally to that a tutorial in our test suite is not as easy to discover as e.g. online tutorials.

[PATCH] builtin/add: add detail to a 'cannot chmod' error message

In addition to adding the missing newline, add the x-ecutable bit 'mode change' character to the error message. This message now has the same form as similar messages output by 'update-index'. Signed-off-by: Ramsay Jones --- Hi Junio, This is v2 of the earlier

Re: reftable [v6]: new ref storage format

On Mon, Aug 7, 2017 at 11:30 AM, Shawn Pearce wrote: > On Mon, Aug 7, 2017 at 11:27 AM, Stefan Beller wrote: >> On Sun, Aug 6, 2017 at 6:47 PM, Shawn Pearce wrote: >>> 6th iteration of the reftable storage format. >>> >>> You can

Re: [PATCH] Convert size datatype to size_t

Martin Koegler writes: > diff --git a/apply.c b/apply.c > index f2d5991..ea97fd2 100644 > --- a/apply.c > +++ b/apply.c > @@ -3085,7 +3085,7 @@ static int apply_binary_fragment(struct apply_state > *state, >struct patch *patch) > { >

[PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

find_pack_entry_one() uses the fan-out table of pack indexes to find out which entries match the first byte of the searched hash and does a binary search on this subset of the main index table. If there are no matching entries then lo and hi will have the same value. The binary search still

Re: [PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

On Tue, Aug 08, 2017 at 06:52:31PM -0400, Jeff King wrote: > > Interesting. I see that we still have the conditional code to call > > out to sha1-lookup.c::sha1_entry_pos(). Do we need a similar change > > over there, I wonder? Alternatively, as we have had the experimental > >

Re: reftable [v6]: new ref storage format

Shawn Pearce writes: > Given that the index can now also be multi-level, I don't expect to > see a 2G index. A 2G index forces the reader to load the entire 2G to > take advantage of the restart table. It may be more efficient for such > a reader to have had the writer make

Re: [PATCH] builtin/add: add a missing newline to an stderr message

On 08/08/17 22:45, René Scharfe wrote: > Am 08.08.2017 um 23:36 schrieb Ramsay Jones: >> >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Junio, >> >> I noticed this while looking into the t3700 failure on cygwin tonight. >> Also, I couldn't decide whether or not to

Re: reftable [v6]: new ref storage format

On Tue, Aug 8, 2017 at 4:34 PM, Junio C Hamano wrote: > Shawn Pearce writes: > >> Given that the index can now also be multi-level, I don't expect to >> see a 2G index. A 2G index forces the reader to load the entire 2G to >> take advantage of the restart

Re: [PATCH] t1200: remove t1200-tutorial.sh

Stefan Beller wrote: > On Tue, Aug 8, 2017 at 5:07 PM, Jonathan Nieder wrote: >> Stefan Beller wrote: >>> Nowadays there are better tutorials out there such as "Git from bottom up" >>> or others, easily found online. Additionally to that a tutorial in our >>> test suite is

Re: [PATCH] t4062: stop using repetition in regex

René Scharfe writes: > Am 08.08.2017 um 16:49 schrieb Johannes Schindelin: >> Hi René, >> >> On Tue, 8 Aug 2017, René Scharfe wrote: >> >>> OpenBSD's regex library has a repetition limit (RE_DUP_MAX) of 255. >>> That's the minimum acceptable value according to POSIX. In t4062 we

Re: [PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

René Scharfe writes: > find_pack_entry_one() uses the fan-out table of pack indexes to find out > which entries match the first byte of the searched hash and does a > binary search on this subset of the main index table. > > If there are no matching entries then lo and hi will have

Re: [PATCH] t1200: remove t1200-tutorial.sh

On Tue, Aug 8, 2017 at 5:07 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> Nowadays there are better tutorials out there such as "Git from bottom up" >> or others, easily found online. Additionally to that a tutorial in our >> test suite is not as easy to

[PATCHv2 2/4] imap-send: add wrapper to get server credentials if needed

Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index 09f29ea95..448a4a0b3 100644 --- a/imap-send.c +++ b/imap-send.c @@

Re: reftable [v6]: new ref storage format

On Sun, Aug 06, 2017 at 06:47:06PM -0700, Shawn Pearce wrote: > Changes from v5: > - extensions.refStorage = reftable is used to select this format. Thanks, I think this is a better scheme going forward. Just a few notes on compatibility while I'm thinking about it: - existing versions will

Re: reftable [v5]: new ref storage format

On Mon, Aug 07, 2017 at 07:41:43AM -0700, Shawn Pearce wrote: > > As such if JGit wanted to use a longer key size, it is possible to implement > > similar automatic builds and packaging into JGit. > > I don't know if we need a larger key size. $DAY_JOB limits ref names > to ~200 bytes in a hook.

Re: reftable [v5]: new ref storage format

On Mon, Aug 07, 2017 at 03:40:48PM +, David Turner wrote: > > -Original Message- > > From: Shawn Pearce [mailto:spea...@spearce.org] > > In git-core, I'm worried about the caveats related to locking. Git tries to > > work > > nicely on NFS, and it seems LMDB wouldn't. Git also runs

[PATCH] t4062: stop using repetition in regex

OpenBSD's regex library has a repetition limit (RE_DUP_MAX) of 255. That's the minimum acceptable value according to POSIX. In t4062 we use 4096 repetitions in the test "-G matches", though, causing it to fail. Do the same as the test "-S --pickaxe-regex" in the same file and search for a single

[PATCHv2 4/4] imap-send: use curl by default

Now that curl is enable by default, use the curl implementation for imap too. The goal is to validate feature parity between the legacy and the curl implementation, deprecate thee legacy implementation later on and in the long term, hopefully drop it altogether. Signed-off-by: Nicolas

[PATCH 1/2] filter-branch: Add --state-branch to hold pickled copy of ref map

Allowing for incremental updates of large trees. I have been using this as part of the device tree extraction from the Linux kernel source since 2013, about time I sent the patch upstream! Signed-off-by: Ian Campbell --- git-filter-branch.sh | 39

[PATCH 0/2] filter-branch: support for incremental update + fix for ancient tag format

Hi, I've long (since 2013, urk!) been carrying these two changes to git- filter-branch in the split out devicetree source tree[0] which extracts all the device tree sources from the Linux kernel source tree. I think it's about time I sent them here, sorry for the rather extreme delay! I've

[PATCH 2/2] filter-branch: Handle rewritting (very) old style tags which lack tagger

Such as v2.6.12-rc2..v2.6.13-rc3 in the Linux kernel source tree. Insert a fake tag header, since newer `git mktag` wont accept the input otherwise: $ git cat-file tag v2.6.12-rc2 object 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 type commit tag v2.6.12-rc2 Linux v2.6.12-rc2

Re: reftable [v5]: new ref storage format

On Tue, Aug 8, 2017 at 12:52 AM, Jeff King wrote: > On Mon, Aug 07, 2017 at 03:40:48PM +, David Turner wrote: > >> > -Original Message- >> > From: Shawn Pearce [mailto:spea...@spearce.org] >> > In git-core, I'm worried about the caveats related to locking. Git tries >>

Re: [RFC] imap-send: escape backslash in password

On Sun, Aug 06, 2017 at 06:34:22PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > That is fine by me. AFAIK, we already build the curl support by default > > when a sufficiently-advanced version of curl is available. So if there > > were feature-parity problems hopefully

[PATCHv2 0/4] imap-send: Fix and enable curl by default

Changes since v1: - Add patch fo fix return value of the curl_append_msgs_to_imap - Patch #2: server_fill_credentials takes a credential struct as a parameter so they can be approved later - Dropped the s/server/srvc/ cleanup (previous patch #3) - Patch #4: Only use curl as the default if it's

[PATCHv2 1/4] imap-send: return with error if curl failed

curl_append_msgs_to_imap always returned 0, whether curl failed or not. Return a proper status so git imap-send will exit with an error code if womething wrong happened. Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 2 +- 1 file changed, 1

[PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Up to this point, the curl mode only supported getting the username and password from the gitconfig file while the legacy mode could also fetch them using the credential API. Signed-off-by: Nicolas Morey-Chaisemartin --- imap-send.c | 10 -- 1 file

Re: [PATCH] Fix delta integer overflows

On Mon, Aug 07, 2017 at 06:44:16PM -0700, Junio C Hamano wrote: > Having said that, I am a bit curious how you came to this patch. > Was the issue found by code inspection, or did you actually have a > real life use case to raise the core.bigFileThreshold configuration > to a value above 4GB?

Re: [PATCH] Fix delta integer overflows

On Mon, Aug 07, 2017 at 09:39:12PM +0200, Johannes Schindelin wrote: > If you want to work on data in memory, then size_t is the appropriate data > type. We already use it elsewhere. Let's use it here, too, without the > intermediate bump from the incorrect `int` to the equally incorrect > `long`.

Re: [PATCH] t1200: remove t1200-tutorial.sh

Jonathan Nieder writes: > Correction: the tutorial is now called gitcore-tutorial and mostly > survives. A search for -p --root failed because of v1.5.5.1~19^2 > (core-tutorial.txt: Fix showing the current behaviour, 2008-04-10). Yeah, I was wondering why neither of you

Re: [PATCH] builtin/add: add detail to a 'cannot chmod' error message

Ramsay Jones writes: > In addition to adding the missing newline, add the x-ecutable bit > 'mode change' character to the error message. This message now has > the same form as similar messages output by 'update-index'. > > Signed-off-by: Ramsay Jones

[PATCH v2 23/25] pack: move has_sha1_pack()

Signed-off-by: Jonathan Tan --- builtin/prune-packed.c | 1 + cache.h| 2 -- diff.c | 1 + pack.h | 2 ++ packfile.c | 6 ++ revision.c | 1 + sha1_file.c| 6 -- 7 files changed,

[PATCH v2 24/25] pack: move has_pack_index()

Signed-off-by: Jonathan Tan --- cache.h | 2 -- pack.h | 2 ++ packfile.c | 8 sha1_file.c | 8 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache.h b/cache.h index d96d36d50..656b39d51 100644 --- a/cache.h +++ b/cache.h

[PATCH v2 17/25] pack: move packed_object_info(), unpack_entry()

Both sha1_file.c and packfile.c now need read_object(), so a copy of read_object() was created in packfile.c. This patch makes both mark_bad_packed_object() and has_packed_and_bad() global. Unlike most of the other patches in this series, these 2 functions need to remain global. Signed-off-by:

[PATCH v2 16/25] sha1_file: remove read_packed_sha1()

Use read_object() in its place instead. This avoids duplication of code. This makes force_object_loose() slightly slower (because of a redundant check of loose object storage), but only in the error case. Signed-off-by: Jonathan Tan --- sha1_file.c | 26

[PATCH v2 18/25] pack: move nth_packed_object_{sha1,oid}

Signed-off-by: Jonathan Tan --- cache.h | 14 -- pack.h | 14 ++ packfile.c | 31 +++ sha1_file.c | 31 --- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/cache.h

[PATCH v2 25/25] pack: move for_each_packed_object()

Signed-off-by: Jonathan Tan --- builtin/cat-file.c | 1 + cache.h| 7 +-- pack.h | 11 +++ packfile.c | 40 reachable.c| 1 + sha1_file.c| 40

[PATCH v2 11/25] pack: move {,re}prepare_packed_git and approximate_object_count

Signed-off-by: Jonathan Tan --- builtin/gc.c | 1 + cache.h| 15 http-backend.c | 1 + pack.h | 15 packfile.c | 216 + path.c | 1 + server-info.c | 1 +

[PATCH v2 06/25] pack: move pack-closing functions

The function close_pack_fd() needs to be temporarily made global. Its scope will be restored to static in a subsequent commit. Signed-off-by: Jonathan Tan --- builtin/am.c| 1 + builtin/clone.c | 1 + builtin/fetch.c | 1 + builtin/merge.c | 1 + cache.h

[PATCH v2 10/25] pack: move install_packed_git()

Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 4 ++-- packfile.c | 11 ++- sha1_file.c | 9 - 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cache.h b/cache.h index bf93477e8..41562dc0b 100644 --- a/cache.h +++

[PATCH v2 01/25] pack: move pack name-related functions

Currently, sha1_file.c and cache.h contain many functions, both related to and unrelated to packfiles. This makes both files very large and causes an unclear separation of concerns. Create a new file, packfile.c, to hold all packfile-related functions currently in sha1_file.c, and designate

[PATCH v2 02/25] pack: move static state variables

sha1_file.c declares some static variables that store packfile-related state. Move them to packfile.c. They are temporarily made global, but subsequent commits will restore their scope back to static. Signed-off-by: Jonathan Tan --- pack.h | 9 +

[PATCH v2 00/25] Move exported packfile funcs to its own file

Here is the complete patch set. I have only moved the exported functions that operate with packfiles and their static helpers - for example, static functions like freshen_packed_object() that are used only by non-pack-specific functions are not moved. In the end, 3 functions needed to be made

[PATCH v2 08/25] pack: move unuse_pack()

Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 1 + packfile.c | 9 + sha1_file.c | 9 - 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache.h b/cache.h index dd9f9a9ae..4812f3a63 100644 --- a/cache.h +++ b/cache.h

[PATCH v2 14/25] pack: move unpack_object_header()

Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 1 + packfile.c | 26 ++ sha1_file.c | 26 -- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cache.h b/cache.h index

[PATCH v2 03/25] pack: move pack_report()

Signed-off-by: Jonathan Tan --- cache.h | 2 -- pack.h | 2 ++ packfile.c | 24 sha1_file.c | 24 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cache.h b/cache.h index 1f0f47819..c7f802e4a

[PATCH v2 05/25] pack: move release_pack_memory()

The function unuse_one_window() needs to be temporarily made global. Its scope will be restored to static in a subsequent commit. Signed-off-by: Jonathan Tan --- git-compat-util.h | 2 -- pack.h| 4 packfile.c| 49

[PATCH v2 15/25] sha1_file: set whence in storage-specific info fn

Move the setting of oi->whence to sha1_loose_object_info() and packed_object_info(). This allows sha1_object_info_extended() to not need to know about the delta base cache. Signed-off-by: Jonathan Tan --- sha1_file.c | 13 ++--- 1 file changed, 6 insertions(+),

[PATCH v2 20/25] pack: move find_pack_entry_one(), is_pack_valid()

Signed-off-by: Jonathan Tan --- cache.h | 8 -- pack.h | 10 ++-- packfile.c | 85 + sha1_file.c | 84 4 files changed, 93

[PATCH v2 21/25] pack: move find_sha1_pack()

Signed-off-by: Jonathan Tan --- cache.h | 3 --- http-push.c | 1 + http-walker.c | 1 + pack.h| 3 +++ packfile.c| 13 + sha1_file.c | 13 - 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cache.h

[PATCH v2 19/25] pack: move check_pack_index_ptr(), nth_packed_object_offset()

Signed-off-by: Jonathan Tan --- cache.h | 16 pack.h | 16 packfile.c | 33 + sha1_file.c | 33 - 4 files changed, 49 insertions(+), 49 deletions(-) diff --git

[PATCH v2 22/25] pack: move find_pack_entry() and make it global

This function needs to be global as it is used by sha1_file.c and will be used by packfile.c. Signed-off-by: Jonathan Tan --- pack.h | 2 ++ packfile.c | 53 + sha1_file.c | 53

[PATCH v2 12/25] pack: move unpack_object_header()

Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 2 ++ packfile.c | 25 + sha1_file.c | 25 - 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/cache.h b/cache.h index f020dfade..9c70759a6

[PATCH v2 09/25] pack: move add_packed_git()

Signed-off-by: Jonathan Tan --- cache.h | 1 - connected.c | 1 + pack.h | 1 + packfile.c | 53 + sha1_file.c | 61 - 5 files changed, 55

Re: [PATCH] sha1_file: avoid comparison if no packed hash matches the first byte

Jeff King writes: > On Tue, Aug 08, 2017 at 06:52:31PM -0400, Jeff King wrote: > >> > Interesting. I see that we still have the conditional code to call >> > out to sha1-lookup.c::sha1_entry_pos(). Do we need a similar change >> > over there, I wonder? Alternatively, as we have

[PATCH v2 13/25] pack: move get_size_from_delta()

Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 1 + packfile.c | 40 sha1_file.c | 39 --- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/cache.h

[PATCH v2 04/25] pack: move open_pack_index(), parse_pack_index()

alloc_packed_git() in packfile.c is duplicated from sha1_file.c. In a subsequent commit, alloc_packed_git() will be removed from sha1_file.c. Signed-off-by: Jonathan Tan --- builtin/count-objects.c | 1 + cache.h | 8 --- pack.h |

[PATCH v2 07/25] pack: move use_pack()

The function open_packed_git() needs to be temporarily made global. Its scope will be restored to static in a subsequent commit. Signed-off-by: Jonathan Tan --- cache.h | 1 - pack.h | 14 +-- packfile.c | 303

Re: [PATCH] t4062: stop using repetition in regex

René Scharfe writes: > Am 09.08.2017 um 00:26 schrieb Junio C Hamano: >> ... but in the meantime, I think replacing the test with "0$" to >> force the scanner to find either the end of line or the end of the >> buffer may be a good workaround. We do not have to care how many of >>

Re: [PATCH] builtin/add: add a missing newline to an stderr message

Jonathan Nieder writes: > I don't believe the force_mode without an 'x' provides a clear signal > to the end user. Perhaps you meant %cx? Indeed you are right. I think I saw Ramsay's v2 that has the 'x', so let's use that version. Thanks.

Re: [RFC] clang-format: outline the git project's coding style

Hi Brandon, On Mon, 7 Aug 2017, Brandon Williams wrote: > Add a '.clang-format' file which outlines the git project's coding > style. This can be used with clang-format to auto-format .c and .h > files to conform with git's style. > > Signed-off-by: Brandon Williams > --- >

Re: Can the '--set-upstream' option of branch be removed ?

On Mon, 2017-08-07 at 13:59 -0700, Junio C Hamano wrote: > Kaartic Sivaraam writes: > > > I refactored builtin/branch.c to remove the '--set-upstream' > > option,successfully. The corresponding patch follows. > > > > There's just one issue with the version of

Re: [RFC] clang-format: outline the git project's coding style

On 08/08, Stefan Beller wrote: > On Tue, Aug 8, 2017 at 5:05 AM, Johannes Schindelin > wrote: > > Hi Brandon, > > > > On Mon, 7 Aug 2017, Brandon Williams wrote: > > > >> Add a '.clang-format' file which outlines the git project's coding > >> style. This can be used

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

On 08/08/2017 15:14, Ævar Arnfjörð Bjarmason wrote: > On Mon, Aug 07 2017, Igor Djordjevic jotted: >> On 07/08/2017 23:25, Igor Djordjevic wrote: >>> On 06/08/2017 22:26, Ævar Arnfjörð Bjarmason wrote: On Sat, Aug 05 2017, Junio C. Hamano jotted: > I actually consider "branch" to *never*

Re: [PATCH v2 2/2 / RFC] branch: quote branch/ref names to improve readability

On Tue, Aug 8, 2017 at 10:11 AM, Kaartic Sivaraam wrote: > Signed-off-by: Kaartic Sivaraam > --- > branch.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) I like this patch. In submodule.c we quote a lot

Re: [PATCH] git svn fetch: Create correct commit timestamp when using --localtime

Junio C Hamano writes: > > Yep, seems alright. Can you apply directly? > > Been a bit preoccupied as of late. Thanks. > > Surely, I'll just add your Reviewed-by: myself ;-) OK, thanks. This will fix the bug I've reported here a week or so ago (see the References header).

Re: reftable [v6]: new ref storage format

I notice that you raised the location of restart table within a block in this iteration (or maybe it happened in v5). This forces you to hold all contents in core before the first byte is written out. You start from the first entry (which will become the first restart entry), emit a handful as

Re: [RFC] clang-format: outline the git project's coding style

Brandon Williams writes: >> > +# Add a line break after the return type of top-level functions >> > +# int >> > +# foo(); >> > +AlwaysBreakAfterReturnType: TopLevel >> >> We do that? > > Haha So generally no we don't do this. Though there are definitely many > places in our

Re: [PATCH v2 1/2 / RFC] builtin/branch: stop supporting the use of --set-upstream option

On 8 August 2017 at 19:11, Kaartic Sivaraam wrote: > The '--set-upstream' option of branch was deprecated in, > > b347d06bf branch: deprecate --set-upstream and show help if we > detect possible mistaken use (Thu, 30 Aug 2012 19:23:13 +0200) > > It was

Re: [PATCH 0/6] clean up parsing of maybe_bool

On 8 August 2017 at 19:04, Junio C Hamano wrote: > Martin Ågren writes: > >> Thanks, both of you. I could wait a couple of days to see if there are >> other things to address, then send a v2 with a more aggressive patch 5? > > Sounds like a plan. If

Re: [RFC] clang-format: outline the git project's coding style

On Tue, Aug 8, 2017 at 5:05 AM, Johannes Schindelin wrote: > Hi Brandon, > > On Mon, 7 Aug 2017, Brandon Williams wrote: > >> Add a '.clang-format' file which outlines the git project's coding >> style. This can be used with clang-format to auto-format .c and .h >>

Re: [PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

On 8 August 2017 at 09:48, Nicolas Morey-Chaisemartin wrote: > Up to this point, the curl mode only supported getting the username > and password from the gitconfig file while the legacy mode could also > fetch them using the credential API. > > Signed-off-by:

[PATCH v2] am: fix signoff when other trailers are present

From: Phillip Wood If there was no 'Signed-off-by:' trailer but another trailer such as 'Reported-by:' then 'git am --signoff' would add a blank line between the existing trailers and the added 'Signed-off-by:' line. e.g. Rebase accepts '--rerere-autoupdate' as

Re: [PATCH] Fix delta integer overflows

Hi Martin, On Tue, 8 Aug 2017, Martin Koegler wrote: > On Mon, Aug 07, 2017 at 09:39:12PM +0200, Johannes Schindelin wrote: > > If you want to work on data in memory, then size_t is the appropriate data > > type. We already use it elsewhere. Let's use it here, too, without the > > intermediate

Re: [PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Le 08/08/2017 à 12:09, Martin Ågren a écrit : > On 8 August 2017 at 09:48, Nicolas Morey-Chaisemartin > wrote: >> Up to this point, the curl mode only supported getting the username >> and password from the gitconfig file while the legacy mode could also >> fetch

Re: [PATCH v1] am: fix signoff when other trailers are present

On 07/08/17 18:49, Junio C Hamano wrote: > Phillip Wood writes: > >> From: Phillip Wood >> >> If there was no 'Signed-off-by:' trailer but another trailer such as >> 'Reported-by:' then 'git am --signoff' would add a blank line between >>

Re: [PATCH v1] am: fix signoff when other trailers are present

On 07/08/17 19:08, Jonathan Tan wrote: > On Mon, 07 Aug 2017 10:49:28 -0700 > Junio C Hamano wrote: > >> Phillip Wood writes: >> >>> From: Phillip Wood >>> >>> If there was no 'Signed-off-by:' trailer but another trailer

Re: Partial clone design (with connectivity check for locally-created objects)

On 8/7/2017 3:21 PM, Jonathan Nieder wrote: Hi, Ben Peart wrote: On Fri, 04 Aug 2017 15:51:08 -0700 Junio C Hamano wrote: Jonathan Tan writes: "Imported" objects must be in a packfile that has a ".remote" file with arbitrary text (similar to

Re: What's cooking in git.git (Jul 2017, #09; Mon, 31)

On Mon, Aug 07 2017, Igor Djordjevic jotted: > On 07/08/2017 23:25, Igor Djordjevic wrote: >> On 06/08/2017 22:26, Ævar Arnfjörð Bjarmason wrote: >>> On Sat, Aug 05 2017, Junio C. Hamano jotted: I actually consider "branch" to *never* invoking a checkout. Even when "git branch -m A B"

Re: Partial clone design (with connectivity check for locally-created objects)

On 8/7/2017 3:41 PM, Junio C Hamano wrote: Ben Peart writes: My concern with this proposal is the combination of 1) writing a new pack file for every git command that ends up bringing down a missing object and 2) gc not compressing those pack files into a single pack

Re: [RFC] imap-send: escape backslash in password

Jeff King writes: > I think we're not quite ready to switch to curl based on comments in the > nearby thread. But just for reference, since I started looking into > this... > > The defines in the Makefile turn on USE_CURL_FOR_IMAP_SEND want curl > 7.34.0. That's only from 2013,

Re: [PATCH v2 0/5] Fsck for lazy objects, and (now) actual invocation of loader

On 7/31/2017 5:02 PM, Jonathan Tan wrote: Besides review changes, this patch set now includes my rewritten lazy-loading sha1_file patch, so you can now do this (excerpted from one of the tests): test_create_repo server test_commit -C server 1 1.t abcdefgh HASH=$(git hash-object

Re: [PATCH] git svn fetch: Create correct commit timestamp when using --localtime

Eric Wong writes: > Junio C Hamano wrote: >> Urs Thuermann writes: >> >> > In parse_svn_date() prepend the correct UTC offset to the timestamp >> > returned. This is the offset in effect at the commit time instead of >> > the offset

Dear Beloved Friend

Dear Beloved Friend, I am Mrs Nicole Benoite Marois and I have been suffering from ovarian cancer disease and the doctor says that i have just few weeks to leave. I am from (Paris) France but based in Benin republic since eleven years ago as a business woman dealing with gold exportation

Re: Can the '--set-upstream' option of branch be removed ?

Kaartic Sivaraam writes: > Just to be sure, you mean "die() with a good message" when you say > "fail these requests, telling them that the former option no longer is > supported." Yes. > It's pretty surprising it takes almost a decade to *stop accepting* a >

  1   2   >