Re: [PATCH] p5310: Fix broken chain in performance test

2015-06-26 Thread Stefan Beller
On Fri, Jun 26, 2015 at 3:27 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Signed-off-by: Stefan Beller sbel...@google.com Thanks. How did you find this (does the auto -chain test apply to t/perf stuff as well)? Apparently the -chain tests for it as I

Re: [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:41 PM, Jeff King p...@peff.net wrote: On Fri, Jun 12, 2015 at 02:39:01PM -0700, Stefan Beller wrote: - if (starts_with(buf, PACK) || starts_with(buf + 1, PACK)) { + if (starts_with(buf, PACK) || starts_with(buf, \1PACK)) { This answers the question

Re: [PATCH 2/3] pkt-line: tighten sideband PACK check when tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King p...@peff.net wrote: To find the start of the pack data, we accept the word PACK at the beginning of any sideband channel, even though what we really want is to find the pack data on channel 1. In practice this doesn't matter, as sideband-2 messages

Re: [PATCH 1/3] pkt-line: simplify starts_with checks in packet tracing

2015-06-12 Thread Stefan Beller
On Fri, Jun 12, 2015 at 2:28 PM, Jeff King p...@peff.net wrote: We carefully check that our pkt buffer has enough characters before seeing if it starts with PACK. The intent is to avoid reading random memory if we get a short buffer like PAC. However, we know that the traced packets are

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-17 Thread Stefan Beller
On Wed, Jun 17, 2015 at 12:12 PM, Jeff King p...@peff.net wrote: On Wed, Jun 17, 2015 at 10:58:10AM -0700, Stefan Beller wrote: Just make strbuf_slopbuf[] large enough to keep Coverity happy. If it's happy, we'll have cleaner defect list It's down 31 defects, roughly 10% of all things

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-17 Thread Stefan Beller
Just make strbuf_slopbuf[] large enough to keep Coverity happy. If it's happy, we'll have cleaner defect list It's down 31 defects, roughly 10% of all things coverity detected as problematic. YAY! -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-17 Thread Stefan Beller
On Wed, Jun 17, 2015 at 12:25 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Just make strbuf_slopbuf[] large enough to keep Coverity happy. If it's happy, we'll have cleaner defect list It's down 31 defects, roughly 10% of all things coverity detected

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-17 Thread Stefan Beller
On Wed, Jun 17, 2015 at 3:16 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: It usually goes like this strbuf sb = STRBUF_INIT; if (!strncmp(sb.buf, foo, 3)) printf(%s, sb.buf + 3); Coverity thinks that printf() can be executed, and because initial sb.buf only has one

Re: git lock files (Was: GIT for Microsoft Access projects)

2015-06-10 Thread Stefan Beller
On Wed, Jun 10, 2015 at 12:47 AM, Fredrik Gustafsson iv...@iveqy.com wrote: On Tue, Jun 09, 2015 at 10:19:43AM -0700, Stefan Beller wrote: Just because Git allows distributed workflows, doesn't mean we should only focus on being distributed IMHO. The question for content not being mergable

Re: [PATCH v2 00/12] Improve refs module encapsulation

2015-06-14 Thread Stefan Beller
On Sat, Jun 13, 2015 at 7:42 AM, Michael Haggerty mhag...@alum.mit.edu wrote: This is v2 of this patch series. I think I have addressed all of the feedback from v1 [1]. Thanks to Stefan, Peff and Junio for their feedback. This version looks good to me. Changes since v1: * Change docstring

Re: [PATCH v2 18/19] pull --rebase: error on no merge candidate cases

2015-06-03 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan pyoka...@gmail.com wrote: Tweak the error messages printed by die_no_merge_candidates() to take into account that we may be rebasing against rather than merging with. Signed-off-by: Paul Tan pyoka...@gmail.com --- Notes: v2 * Decided to

Re: [PATCH v2 19/19] pull: remove redirection to git-pull.sh

2015-06-03 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan pyoka...@gmail.com wrote: At the beginning of the rewrite of git-pull.sh to C, we introduced a redirection to git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL was not defined in order to not break test scripts that relied on a functional

Re: Suggestion: make git checkout safer

2015-06-03 Thread Stefan Beller
Maybe the expectation comes from the existing warnings when checking out branches? $ mkdir tmp cd tmp $ git init $ echo Hello foo $ git add foo $ git commit -am Hello $ git branch next $ echo world bar $ git add bar $ git commit -a -m World $ git checkout

Re: [PATCH] glossary: add remote, submodule, superproject

2015-05-28 Thread Stefan Beller
On Thu, May 28, 2015 at 9:45 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Noticed-by: Philip Oakley philipoak...@iee.org Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/glossary

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word drop to remove a commit

2015-05-28 Thread Stefan Beller
On Thu, May 28, 2015 at 10:06 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Stefan, On 2015-05-27 23:47, Stefan Beller wrote: On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote: Talking about ideas: I sometimes have the wrong branch checked out when doing

Re: Redirect git subcommand to itself?

2015-05-29 Thread Stefan Beller
Thanks a lot for the discussion! So I'll just fix it locally for me and we keep the state as is. -- 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 http://vger.kernel.org/majordomo-info.html

Re: BUG: Wrong error message when access to .git directory denied

2015-05-29 Thread Stefan Beller
On Fri, May 29, 2015 at 8:29 AM, Junio C Hamano gits...@pobox.com wrote: Jonas Berlin xk...@outerspace.dyndns.org writes: Severity: Low Impact: Confusion ;-) Git version: 1.9.1 If I don't have permissions to access the .git folder of a non-bare git repository, I get the following

Re: [RFC/WIP PATCH 00/11] Protocol version 2, again!

2015-06-01 Thread Stefan Beller
On Wed, May 27, 2015 at 12:08 AM, Jeff King p...@peff.net wrote: On Wed, May 27, 2015 at 02:18:18AM -0400, Jeff King wrote: The new protocol works just like the old protocol, except for the capabilities negotiation being before any exchange of real data. I like this approach. [...] So

Re: [PATCH] l10n: de.po: translate index as Index

2015-06-01 Thread Stefan Beller
On Mon, Jun 1, 2015 at 12:26 PM, Christian Stimming stimm...@tuhh.de wrote: index concept, my explanation routinely says This concept is called 'index' but it has nothing to do with any associations you make with that word. Better remember this thingy as *** and replace the termin 'index' with

Re: [RFC/WIP PATCH 11/11] Document protocol version 2

2015-06-01 Thread Stefan Beller
On Fri, May 29, 2015 at 3:21 PM, Jeff King p...@peff.net wrote: On Fri, May 29, 2015 at 02:52:14PM -0700, Junio C Hamano wrote: Currently we can do a = as part of the line after the first ref, such as symref=HEAD:refs/heads/master agent=git/2:2.4.0 so I thought we want to keep

Re: [RFC/WIP PATCH 11/11] Document protocol version 2

2015-06-01 Thread Stefan Beller
On Mon, Jun 1, 2015 at 4:14 PM, Stefan Beller sbel...@google.com wrote: On Fri, May 29, 2015 at 3:21 PM, Jeff King p...@peff.net wrote: On Fri, May 29, 2015 at 02:52:14PM -0700, Junio C Hamano wrote: Currently we can do a = as part of the line after the first ref, such as symref

[RFCv2 00/16] Protocol version 2

2015-06-01 Thread Stefan Beller
patches 1-4 are for the uploading side (upload-pack) and 5-13 for the fetching side. patches 14-16 are documentation and the tiny test. Nguyễn Thái Ngọc Duy (1): upload-pack: make client capability parsing code a separate function Stefan Beller (15): stringlist: add

[RFCv2 01/16] stringlist: add from_space_separated_string

2015-06-01 Thread Stefan Beller
This function parses a space separated string into a string list. Signed-off-by: Stefan Beller sbel...@google.com --- string-list.c | 12 string-list.h | 1 + 2 files changed, 13 insertions(+) diff --git a/string-list.c b/string-list.c index 2a32a3f..f71384f 100644 --- a/string

[RFCv2 12/16] transport: get_refs_via_connect exchanges capabilities before refs.

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Notes: A minor issue I am unsure about here is the line transport-smart_options-transport_version) which could be prevented if we always set the transport_version in make_remote to be the default remote version

[RFCv2 09/16] remote.h: add get_remote_capabilities, request_capabilities

2015-06-01 Thread Stefan Beller
which will tell the selection of capabilities to the remote. Signed-off-by: Stefan Beller sbel...@google.com --- connect.c | 37 + remote.h | 3 +++ 2 files changed, 40 insertions(+) diff --git a/connect.c b/connect.c index a2c777e..4ebe1dc 100644

[RFCv2 15/16] Documentation/technical/pack-protocol: Mention http as possible protocol

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- This may go unrelated to this series as well. Documentation/technical/pack-protocol.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack

[RFCv2 03/16] connect: rewrite feature parsing to work on string_list

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- builtin/receive-pack.c | 13 + connect.c | 79 ++ connect.h | 2 +- upload-pack.c | 11 +-- 4 files changed, 51 insertions(+), 54 deletions(-) diff

[RFCv2 02/16] upload-pack: make client capability parsing code a separate function

2015-06-01 Thread Stefan Beller
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Stefan Beller sbel...@google.com --- upload-pack.c | 44 +++- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/upload-pack.c b

[RFCv2 11/16] remote: have preselect_capabilities

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- connect.c | 28 remote.h | 1 + 2 files changed, 29 insertions(+) diff --git a/connect.c b/connect.c index 4ebe1dc..752b9a5 100644 --- a/connect.c +++ b/connect.c @@ -126,6 +126,34 @@ void get_remote_capabilities

[RFCv2 13/16] fetch-pack: use the configured transport protocol

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- builtin/fetch-pack.c | 22 ++- fetch-pack.c | 109 +++ fetch-pack.h | 1 + 3 files changed, 80 insertions(+), 52 deletions(-) diff --git a/builtin/fetch-pack.c b/builtin

[RFCv2 16/16] Document protocol version 2

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/technical/pack-protocol.txt | 79 +-- Documentation/technical/protocol-capabilities.txt | 15 - 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/Documentation/technical/pack

[RFCv2 14/16] t5544: add a test case for the new protocol

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- t/t5544-fetch-2.sh | 40 1 file changed, 40 insertions(+) create mode 100755 t/t5544-fetch-2.sh diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh new file mode 100755 index 000..beee46c --- /dev

[RFCv2 05/16] remote.h: Change get_remote_heads return to void

2015-06-01 Thread Stefan Beller
No function uses the return value of get_remote_heads, so we don't want to confuse readers by it. Signed-off-by: Stefan Beller sbel...@google.com --- connect.c | 10 -- remote.h | 8 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/connect.c b/connect.c index

[RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack

2015-06-01 Thread Stefan Beller
In upload-pack-2 we send each capability in its own packet buffer. Signed-off-by: Stefan Beller sbel...@google.com --- Notes: Moved the capabilities into a struct containing all the capabilities, and then we selectively cancel out unwanted capabilities. .gitignore | 1

[RFCv2 06/16] remote.h: add new struct for options

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- remote.h | 14 ++ 1 file changed, 14 insertions(+) diff --git a/remote.h b/remote.h index d5242b0..16cacfe 100644 --- a/remote.h +++ b/remote.h @@ -56,6 +56,20 @@ struct remote { char *http_proxy; }; +/* todo: discuss

[RFCv2 08/16] transport: select transport version via command line or config

2015-06-01 Thread Stefan Beller
The transport version set via command line argument in git fetch takes precedence over the configured version. Signed-off-by: Stefan Beller sbel...@google.com --- Notes: removed -y as the short --transport-version This patch has been split up and is the second part carrying only

[RFCv2 07/16] transport: add infrastructure to support a protocol version number

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Notes: This patch has been split up into 2 parts. This first part only introduces the infrastructure without exposing it to the user at all (no command line option nor a repository configuration option). The exposure

[RFCv2 10/16] transport: connect_setup appends protocol version number

2015-06-01 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Notes: name it to_free transport.c | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/transport.c b/transport.c index 651f0ac..b49fc60 100644 --- a/transport.c +++ b/transport.c @@ -496,15 +496,28

Re: [PATCH/WIP 1/8] wrapper: implement xopen()

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 6:33 AM, Paul Tan pyoka...@gmail.com wrote: A common usage pattern of open() is to check if it was successful, and die() if it was not: int fd = open(path, O_WRONLY | O_CREAT, 0777); if (fd 0) die_errno(_(Could not open '%s' for

Re: [RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack

2015-05-27 Thread Stefan Beller
On Tue, May 26, 2015 at 11:35 PM, Jeff King p...@peff.net wrote: On Tue, May 26, 2015 at 03:01:08PM -0700, Stefan Beller wrote: --- a/upload-pack.c +++ b/upload-pack.c @@ -716,10 +716,47 @@ static void format_symref_info(struct strbuf *buf, struct string_list *symref

[PATCHv3] submodule documentation: Reorder introductory paragraphs

2015-05-27 Thread Stefan Beller
think this may confuse readers, specially newcomers though. Additionally to reordering the paragraphs, they have been slightly reworded. Signed-off-by: Stefan Beller sbel...@google.com --- I think this is the best I can come up with for now. * It still mentions the remotes as a potential explanation

Re: [RFC/WIP PATCH 05/11] transport: add infrastructure to support a protocol version number

2015-05-27 Thread Stefan Beller
On Tue, May 26, 2015 at 11:39 PM, Jeff King p...@peff.net wrote: On Tue, May 26, 2015 at 03:01:09PM -0700, Stefan Beller wrote: + OPT_STRING('y', transport-version, transport_version, +N_(transport-version), +N_(specify transport version to be used

Re: [RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 1:34 PM, Jeff King p...@peff.net wrote: On Wed, May 27, 2015 at 10:40:37AM -0700, Stefan Beller wrote: If we are upload-pack-2, should we advertise that in the capabilities? I think it may make things easier later if we try to provide some opportunistic out-of-band

[PATCH] glossary: add remote and submodule

2015-05-27 Thread Stefan Beller
Noticed-by: Philip Oakley philipoak...@iee.org Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/glossary-content.txt | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index bf383c2..e303135

[PATCH] glossary: add remote, submodule, superproject

2015-05-29 Thread Stefan Beller
Noticed-by: Philip Oakley philipoak...@iee.org Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Stefan Beller sbel...@google.com --- Moved information regarding the superproject from submodule to superproject, and slightly reworded the superproject description. Documentation/glossary

Redirect git subcommand to itself?

2015-05-27 Thread Stefan Beller
Hi, so I just run into this problem again (which happens to me maybe twice a week): I want to do a git operations, so I type git into my shell, and then I look around what exactly I want to do and usually I find it in the help text of a previous command such as You are currently reverting

[PATCH] glossary: add remote, submodule, superproject

2015-05-27 Thread Stefan Beller
Noticed-by: Philip Oakley philipoak...@iee.org Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/glossary-content.txt | 17 + 1 file changed, 17 insertions(+) diff --git a/Documentation/glossary-content.txt b

Re: [PATCH] glossary: add remote and submodule

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Noticed-by: Philip Oakley philipoak...@iee.org Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/glossary-content.txt | 10 ++ 1 file changed, 10

Re: Bug: .gitconfig folder

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 3:18 PM, Jeff King p...@peff.net wrote: On Wed, May 27, 2015 at 01:30:29PM -0700, Junio C Hamano wrote: Jorge grif...@gmx.es writes: If you have a folder named ~/.gitconfig instead of a file with that name, when you try to run some global config editing command it

Re: [PATCH v2 3/3] read_loose_refs(): treat NULL_SHA1 loose references as broken

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 8:57 AM, Michael Haggerty mhag...@alum.mit.edu wrote: NULL_SHA1 is never a valid value for a reference. If a loose reference has that value, mark it as broken. Why check NULL_SHA1 and not the nearly 2^160 other SHA-1s that are also invalid in a given repository? Because

Re: [RFC/WIP PATCH 06/11] remote.h: add get_remote_capabilities, request_capabilities

2015-05-29 Thread Stefan Beller
On Tue, May 26, 2015 at 11:45 PM, Jeff King p...@peff.net wrote: On Tue, May 26, 2015 at 03:01:10PM -0700, Stefan Beller wrote: +void get_remote_capabilities(int in, char *src_buf, size_t src_len) +{ + struct strbuf capabilities_string = STRBUF_INIT; + for (;;) { + int

Re: [RFC/WIP PATCH 11/11] Document protocol version 2

2015-05-29 Thread Stefan Beller
On Fri, May 29, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: @@ -1,11 +1,11 @@ Packfile transfer protocols === -Git supports transferring data in packfiles over the ssh://, git:// and +Git supports transferring

Re: [PATCH 2/7] pack-protocol.txt: Mark LF in command-list as optional

2015-07-01 Thread Stefan Beller
On Wed, Jul 1, 2015 at 11:08 AM, Dave Borowitz dborow...@google.com wrote: Signed-off-by: Dave Borowitz dborow...@google.com --- Documentation/technical/pack-protocol.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/technical/pack-protocol.txt

Re: [PATCH v4 31/44] builtin-am: implement -S/--gpg-sign, commit.gpgsign

2015-07-01 Thread Stefan Beller
On Wed, Jul 1, 2015 at 1:01 AM, Paul Tan pyoka...@gmail.com wrote: On Tue, Jun 30, 2015 at 7:51 AM, Stefan Beller sbel...@google.com wrote: I needed to read this patch a few times as this patch introduces `sign_commit` twice. This is mostly a review problem I'd guess as in the code it just

Re: [PATCH v4 28/44] builtin-am: pass git-apply's options to git-apply

2015-07-01 Thread Stefan Beller
On Wed, Jul 1, 2015 at 3:22 AM, Paul Tan pyoka...@gmail.com wrote: On Tue, Jun 30, 2015 at 7:56 AM, Stefan Beller sbel...@google.com wrote: I realize this was in am.sh as well, but I find the help strings a bit unfortunate. (Yes, you actually need to look them up at another place as most

Re: [PATCH 00/12] Improve git-am test coverage

2015-07-03 Thread Stefan Beller
On Thu, Jul 2, 2015 at 11:16 AM, Paul Tan pyoka...@gmail.com wrote: Increase test coverage of git-am.sh to help prevent regressions that could arise from the rewrite of git-am.sh to C. This patch series, along with pt/am-foreign, improved test coverage as measured by kcov from 56.5%[1] to

Re: [PATCH/WIP v2 04/19] am: implement patch queue mechanism

2015-06-11 Thread Stefan Beller
On Thu, Jun 11, 2015 at 3:21 AM, Paul Tan pyoka...@gmail.com wrote: git-am applies a series of patches. If the process terminates abnormally, we want to be able to resume applying the series of patches. This requires the session state to be saved in a persistent location. Implement the

Re: [PATCH/WIP v2 05/19] am: split out mbox/maildir patches with git-mailsplit

2015-06-11 Thread Stefan Beller
On Thu, Jun 11, 2015 at 3:21 AM, Paul Tan pyoka...@gmail.com wrote: git-am.sh supports mbox, stgit and mercurial patches. Re-implement support for splitting out mbox/maildirs using git-mailsplit, while also implementing the framework required to support other patch formats in the future.

Re: [PATCH] fetch-pack: optionally save packs to disk

2015-06-11 Thread Stefan Beller
On Thu, Jun 11, 2015 at 10:44 AM, Augie Fackler au...@google.com wrote: When developing server software, it's often helpful to save a potentially-bogus pack for later analysis. This makes that trivial, instead of painful. This is made a little complicated by the fact that in some cases (like

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 1:04 PM, Junio C Hamano gits...@pobox.com wrote: On Fri, May 22, 2015 at 12:59 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-05-22 21:23, Stefan Beller wrote: So first of all: Where do I find the Amazon SES account for submitGit, to register my

Re: [PATCH 1/5] verify_lock(): return 0/-1 rather than struct ref_lock *

2015-05-22 Thread Stefan Beller
to the traditional return 0 on success or a negative value on error. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Bonus points for the documentation! Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git

Re: [PATCH 0/5] Fix verify_lock() to report errors via strbuf

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 4:34 PM, Michael Haggerty mhag...@alum.mit.edu wrote: verify_lock() is a helper function called while committing reference transactions. But when it fails, instead of recording its error message in a strbuf to be passed back to the caller of ref_transaction_commit(),

[PATCH] submodule documentation: Rewrite introductory paragraphs

2015-05-21 Thread Stefan Beller
think this may confuse readers, specially newcomers though. Signed-off-by: Stefan Beller sbel...@google.com --- I rewrote the first 2 paragraphs as well now. I think it doesn't make sense to mention any subcommand in the description section, so I removed When adding a new submodule to the tree

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Stefan Beller
On Thu, May 21, 2015 at 10:24 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Reorder the paragraphs such that the first short paragraph introduces the submodule concept, the second paragraph highlights the usage of the submodule command, the third

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-21 Thread Stefan Beller
On Thu, May 21, 2015 at 1:03 PM, Philip Oakley philipoak...@iee.org wrote: +Submodules are not to be confused with remotes, which are meant +mainly for branches of the same project; This use of 'branches' didn't work for me. remotes are meant mainly for branches of the same project ? Maybe

Re: [PATCH] test_bitmap_walk: free bitmap with bitmap_free

2015-05-22 Thread Stefan Beller
On Thu, May 21, 2015 at 5:53 PM, Jeff King p...@peff.net wrote: Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) noticed that we leak the result bitmap. But we should use bitmap_free rather than straight free, as the former remembers to free the bitmap array pointed to by the struct.

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 1:33 AM, Roberto Tyley roberto.ty...@gmail.com wrote: On Tuesday, 19 May 2015, Stefan Beller sbel...@google.com wrote: On Tue, May 19, 2015 at 12:29 PM, Robert Dailey rcdailey.li...@gmail.com wrote: How do you send your patches inline? [snip] This workflow discussion

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 7:14 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Paul, On 2015-05-22 15:48, Paul Tan wrote: On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano gits...@pobox.com wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: -

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Stefan Beller
Ok, I am trying it out now, all I have left is Register your email address (stefanbel...@googlemail.com) with submitGit's Amazon SES account in order for it to send emails from you. So first of all: Where do I find the Amazon SES account for submitGit, to register my email

[PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
think this may confuse readers, specially newcomers though. Additionally to reordering the paragraphs, they have been slightly reworded. Signed-off-by: Stefan Beller sbel...@google.com --- For now I used a part of Junios suggestion Submodules are not to be confused with remotes, which are other

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Thu, May 21, 2015 at 1:03 PM, Philip Oakley philipoak...@iee.org wrote: +Submodules are not to be confused with remotes, which are meant +mainly for branches of the same

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 10:35 AM, Philip Oakley philipoak...@iee.org wrote: From: Stefan Beller sbel...@google.com On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Thu, May 21, 2015 at 1:03 PM, Philip Oakley philipoak

Re: test suite failure t5570, 8 with v2.4.1-168-g1ea28e1

2015-05-19 Thread Stefan Beller
Sorry for the noise, it must be a machine specific thing at my end, because v2.3 and even v2.0.0 fail the test now. To observe the failing test I run $ make (cd t; ./t5570-git-daemon.sh) which should be sufficient to not have stale data? I'll try to follow the test script and look into

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-26 Thread Stefan Beller
On Mon, May 25, 2015 at 3:00 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: DESCRIPTION --- +This command will inspect, update and manage submodules. +Submodules allow you to keep another Git repository in a subdirectory +of your repository

Re: [RFC/WIP PATCH 02/11] upload-pack: only accept capabilities on the first want line

2015-05-26 Thread Stefan Beller
On Tue, May 26, 2015 at 3:17 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com pack-protocol.txt says so and fetch-pack also follows it even though upload-pack is a bit lax. Fix it. Hmm, I actually think

Re: [RFC/WIP PATCH 08/11] transport: connect_setup appends protocol version number

2015-05-26 Thread Stefan Beller
On Tue, May 26, 2015 at 3:21 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: + if (transport-smart_options + transport-smart_options-transport_version) { + buf = xmalloc(strlen(remote_program) + 12); + sprintf(buf, %s

[RFC/WIP PATCH 07/11] fetch-pack: use the configured transport protocol

2015-05-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- builtin/fetch-pack.c | 17 - fetch-pack.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 4a6b340..32dc8b0 100644 --- a/builtin/fetch-pack.c +++ b

[RFC/WIP PATCH 01/11] upload-pack: make client capability parsing code a separate function

2015-05-26 Thread Stefan Beller
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Stefan Beller sbel...@google.com --- upload-pack.c | 44 +++- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/upload-pack.c b

[RFC/WIP PATCH 03/11] upload-pack: move capabilities out of send_ref

2015-05-26 Thread Stefan Beller
This will make it easier to reuse the capabilities in a later patch. Signed-off-by: Stefan Beller sbel...@google.com --- upload-pack.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 6734777..a5f75b7 100644 --- a/upload

[RFC/WIP PATCH 05/11] transport: add infrastructure to support a protocol version number

2015-05-26 Thread Stefan Beller
The transport version set via command line argument in git fetch takes precedence over the configured version. Signed-off-by: Stefan Beller sbel...@google.com --- builtin/fetch.c| 6 ++ remote.c | 2 ++ remote.h | 2 ++ transport-helper.c | 1 + transport.c

[RFC/WIP PATCH 09/11] transport: get_refs_via_connect exchanges capabilities before refs.

2015-05-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- transport.c | 29 + 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/transport.c b/transport.c index 33644a6..1cd9b77 100644 --- a/transport.c +++ b/transport.c @@ -526,12 +526,33 @@ static struct ref

[RFC/WIP PATCH 11/11] Document protocol version 2

2015-05-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/technical/pack-protocol.txt | 86 --- Documentation/technical/protocol-capabilities.txt | 15 2 files changed, 77 insertions(+), 24 deletions(-) diff --git a/Documentation/technical/pack

[RFC/WIP PATCH 10/11] t5544: add a test case for the new protocol

2015-05-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- t/t5544-fetch-2.sh | 40 1 file changed, 40 insertions(+) create mode 100755 t/t5544-fetch-2.sh diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh new file mode 100755 index 000..beee46c --- /dev

[RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack

2015-05-26 Thread Stefan Beller
In upload-pack-2 we send each capability in its own packet. By reusing the advertise_capabilities and eventually setting it to NULL we will be able to reuse the methods for refs advertisement. Signed-off-by: Stefan Beller sbel...@google.com --- .gitignore | 1 + Makefile| 2

[RFC/WIP PATCH 00/11] Protocol version 2, again!

2015-05-26 Thread Stefan Beller
! Thanks, Stefan [1] http://permalink.gmane.org/gmane.comp.version-control.git/267572 Nguyễn Thái Ngọc Duy (2): upload-pack: make client capability parsing code a separate function upload-pack: only accept capabilities on the first want line Stefan Beller (9): upload-pack: move capabilities

[RFC/WIP PATCH 06/11] remote.h: add get_remote_capabilities, request_capabilities

2015-05-26 Thread Stefan Beller
which will tell the selection of capabilities to the remote. Signed-off-by: Stefan Beller sbel...@google.com --- connect.c | 48 +++- remote.h | 3 +++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index c0144d8

[RFC/WIP PATCH 02/11] upload-pack: only accept capabilities on the first want line

2015-05-26 Thread Stefan Beller
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com pack-protocol.txt says so and fetch-pack also follows it even though upload-pack is a bit lax. Fix it. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Stefan Beller sbel...@google.com --- upload-pack.c | 7 ++- 1 file changed

[RFC/WIP PATCH 08/11] transport: connect_setup appends protocol version number

2015-05-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- transport.c | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/transport.c b/transport.c index 3ef15f6..33644a6 100644 --- a/transport.c +++ b/transport.c @@ -496,15 +496,29 @@ static int set_git_option

Re: What's cooking in git.git (May 2015, #07; Tue, 26)

2015-05-26 Thread Stefan Beller
* sb/submodule-doc-intro (2015-05-22) 1 commit - submodule documentation: reorder introductory paragraphs What's the doneness of this one??? I'll try again without a This command will do ... introduction, I just did not look into it yet. That said, I was expecting more bike shedding than

Re: [RFC/WIP PATCH 07/11] fetch-pack: use the configured transport protocol

2015-05-26 Thread Stefan Beller
On Tue, May 26, 2015 at 3:19 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: @@ -175,7 +179,18 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) if (!conn) return args.diag_url ? 0 : 1

Re: [PATCH v3 00/56] Convert parts of refs.c to struct object_id

2015-05-26 Thread Stefan Beller
-over-and-run-test-suite-by: Stefan Beller sbel...@google.com if that helps. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187

Re: [RFC/PATCH 2/2] Testing the new code

2015-08-03 Thread Stefan Beller
On Fri, Jul 31, 2015 at 6:02 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: -module_list() +module_list_shell() { eval set $(git rev-parse --sq --prefix $wt_prefix -- $@) ( @@ -187,6 +187,29 @@ module_list() ' } +module_list

[PATCH] run-command: Improve readability of struct child_process

2015-08-12 Thread Stefan Beller
they are a good idea in the code here as well. Signed-off-by: Stefan Beller sbel...@google.com --- run-command.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-command.h b/run-command.h index 1103805..e67395d 100644 --- a/run-command.h +++ b/run-command.h @@ -8,8 +8,9

Re: [PATCH 2/2] cleanup submodule_config a bit.

2015-08-12 Thread Stefan Beller
On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller sbel...@google.com wrote: In the first hunk, `submodule` is NULL all the time, so we can make it clearer by directly returning NULL. In the second hunk, we can

Re: [PATCH 0/7] Submodule improvements

2015-08-17 Thread Stefan Beller
A last minute change in the last patch broke t7400-submodule-basic.sh, test 82 -- 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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH 7/7] submodule: implement `module_clone` as a builtin helper

2015-08-17 Thread Stefan Beller
On Mon, Aug 17, 2015 at 5:22 PM, Stefan Beller sbel...@google.com wrote: `module_clone` is part of the update command, which I want to convert to C next. Signed-off-by: Stefan Beller sbel...@google.com --- builtin/submodule--helper.c | 161

Re: What's cooking in git.git (Aug 2015, #03; Mon, 17)

2015-08-17 Thread Stefan Beller
On Mon, Aug 17, 2015 at 3:34 PM, Junio C Hamano gits...@pobox.com wrote: * hv/submodule-config (2015-06-15) 4 commits - do not die on error of parsing fetchrecursesubmodules option - use new config API for worktree configurations of submodules - extract functions for submodule config set

Re: [PATCH v7 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb()

2015-08-17 Thread Stefan Beller
On Tue, Aug 4, 2015 at 3:05 PM, Max Kirillov m...@max630.net wrote: Functions which directly operate submodule's object database do not handle the case when the submodule is linked worktree (which are introduced in c7b3a3d2fe). Instead of fixing the path calculation use already existing

Re: [PATCH v7 2/2] path: implement common_dir handling in git_path_submodule()

2015-08-17 Thread Stefan Beller
On Tue, Aug 4, 2015 at 3:05 PM, Max Kirillov m...@max630.net wrote: When submodule is a linked worktree, git diff --submodule and other calls which directly access the submodule's object database do not correctly calculate its path. Fix it by changing the git_path_submodule() behavior, to use

[PATCH 0/7] Submodule improvements

2015-08-17 Thread Stefan Beller
Heiko Voigt (4): submodule: implement a config API for lookup of .gitmodules values submodule: extract functions for config set and lookup submodule: use new config API for worktree configurations submodule: Allow errornous values for the fetchrecursesubmodules option Stefan Beller (3

<    5   6   7   8   9   10   11   12   13   14   >