On 27 February 2018 at 04:16, Nuno Subtil wrote:
> When useClientSpec=true, stripping of P4 depot paths doesn't happen
> correctly on sync. Modifies stripRepoPath to handle this case better.
Can you give an example of how this shows up? I could quickly write a
test case for this if I knew what wa
Add a test case highlighting how the process outlined by Sergey Organov
could be used to re-create merges without losing any context.
The test currently only uses new files, with the exception of one part
involving an evil merge. Unfortunately I'm not sure how to represent
merge conflicts that nee
On Tue, Feb 27, 2018 at 1:57 AM, Eric Sunshine wrote:
>> + repo_set_commondir(repo, o->shared_root);
>
> The repo_set_gitdir() prototype (below) makes it seem as if the last
> argument ('o', in this case) is optional, presumably by passing in
> NULL, however, this code does not appear to be
On Tue, Feb 27, 2018 at 1:57 AM, Eric Sunshine wrote:
> Can:
>
> char *old_gitdir = repo->gitdir;
> repo->gitdir = xstrdup(...);
> free(old_gitdir);
>
> be simplified to:
>
> free(repo->gitdir);
> repo->gitdir = xstrdup(...);
>
> ?
No because I think "root" (not quoted here) c
v2 fixes the incorrect use of consecutive getenv() and adds a comment
to clarify the role of old_gitdir
Interdiff:
diff --git a/environment.c b/environment.c
index 95de419de8..47c6e31559 100644
--- a/environment.c
+++ b/environment.c
@@ -14,6 +14,7 @@
#include "fmt-merge-msg.h"
#include "commit
It does not make sense that generic repository code contains handling
of environment variables, which are specific for the main repository
only. Refactor repo_set_gitdir() function to take $GIT_DIR and
optionally _all_ other customizable paths. These optional paths can be
NULL and will be calculate
getenv() is supposed to work on the main repository only. This delayed
getenv() code in sha1_file.c makes it more difficult to convert
sha1_file.c to a generic object store that could be used by both
submodule and main repositories.
Move the getenv() back in setup_git_env() where other env vars ar
This variable was added because the repo_set_gitdir() was created to
cover both submodule and main repos, but these two are initialized a
bit differently so ignore_env == 0 means main repo, while ignore_env
!= 0 is submodules.
Since the difference part (env variables) has been moved out of
repo_se
Signed-off-by: Nguyễn Thái Ngọc Duy
---
repository.c | 45 -
1 file changed, 45 deletions(-)
diff --git a/repository.c b/repository.c
index 343efe7282..7654b8ada9 100644
--- a/repository.c
+++ b/repository.c
@@ -16,51 +16,6 @@ static struct repository
On Tue, Feb 27, 2018 at 4:58 AM, Nguyễn Thái Ngọc Duy wrote:
> v2 fixes the incorrect use of consecutive getenv() and adds a comment
> to clarify the role of old_gitdir
>
> diff --git a/environment.c b/environment.c
> @@ -148,18 +149,34 @@ static char *expand_namespace(const char *raw_namespace)
>
Am 27.02.2018 um 02:18 schrieb Alan Gage:
> Hello, I recently noticed a bug involving GitBash and Python. I was
> running a function that would post the system time once every second
> using a while loop but the text was only sent after the while loop
> ended due to a timer I had set. Essesntially,
From: Phillip Wood
This code is duplicated in a couple of places so make it into a
function as we're going to add some more callers shortly.
Signed-off-by: Phillip Wood
---
git-add--interactive.perl | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/git
From: Phillip Wood
Since commit 8cbd431082 ("git-add--interactive: replace hunk
recounting with apply --recount", 2008-7-2) if a hunk is skipped then
we rely on the context lines to apply subsequent hunks in the right
place. While this works most of the time it is possible for hunks to
end up bei
From: Phillip Wood
When a hunk is skipped by add -i the offsets of subsequent hunks are
not adjusted to account for any missing insertions due to the skipped
hunk. Most of the time this does not matter as apply uses the context
lines to apply the subsequent hunks in the correct place, however in
From: Phillip Wood
Recount the number of preimage and postimage lines in a hunk after it
has been edited so any change in the number of insertions or deletions
can be used to adjust the offsets of subsequent hunks. If an edited
hunk is subsequently split then the offset correction will be lost. I
From: Phillip Wood
Indent here documents in line with the current style for tests.
Signed-off-by: Phillip Wood
---
t/t3701-add-interactive.sh | 174 ++---
1 file changed, 87 insertions(+), 87 deletions(-)
diff --git a/t/t3701-add-interactive.sh b/t/t370
From: Phillip Wood
Simplify things slightly by using the above helpers.
Signed-off-by: Phillip Wood
---
Notes:
changes since v2
- fixed use of test_set_editor to match what was in pu
t/t3701-add-interactive.sh | 33 +
1 file changed, 5 insertions(+),
From: Phillip Wood
Use a filter when comparing diffs to fix the value of non-zero hashes
in diff index lines so we're not hard coding sha1 hash values in the
expected output. This makes it easier to change the expected output if
a test is edited as we don't need to worry about the exact hash valu
From: Phillip Wood
I've fixed the use of test_set_editor most of which was already in pu
and reworked the sha1 comparisons to rewrite the hashes in the index
lines rather than deleting the index lines.
Cover letter to v1:
While working on a patch series to stage selected lines from a hunk
witho
From: Phillip Wood
Now that add -p counts patches properly it should be possible to turn
off the '--recount' option when invoking 'git apply'
Signed-off-by: Phillip Wood
---
Notes:
I can't think of a reason why this shouldn't be OK but I can't help
feeling slightly nervous about it. I'
From: Phillip Wood
When a file has no trailing new line at the end diff records this by
appending "\ No newline at end of file" below the last line of the
file. This line should not be counted in the hunk header. Fix the
splitting and coalescing code to count files without a trailing new line
pro
On 27 February 2018 at 08:43, Nuno Subtil wrote:
> The issue is that passing in --use-client-spec will always cause git-p4 to
> preserve the full depot path in the working tree that it creates, even when
> --keep-path is not used.
>
> The repro case is fairly simple: cloning a given p4 path that i
Peff made an excellent point about the nested if statements. This
goes back to Christian's original recommendation.
-- >8 --
During abbreviation checks, we navigate to the position within a
pack-index that an OID would be inserted and check surrounding OIDs
for the maximum matching prefix. This p
Hi Johannes,
Johannes Schindelin writes:
> Hi Buga,
>
> On Tue, 20 Feb 2018, Igor Djordjevic wrote:
>
>> I`m really interested in this topic, which seems to (try to) address the
>> only "bad feeling" I had with rebasing merges - being afraid of silently
>> losing amendments by actually trying to
> On 25 Feb 2018, at 08:15, Eric Sunshine wrote:
>
> On Sat, Feb 24, 2018 at 11:27 AM, wrote:
>> Git recognizes files encoded with ASCII or one of its supersets (e.g.
>> UTF-8 or ISO-8859-1) as text files. All other encodings are usually
>> interpreted as binary and consequently built-in Git t
On 2/21/2018 7:31 PM, Junio C Hamano wrote:
* jh/status-no-ahead-behind (2018-01-24) 4 commits
- status: support --no-ahead-behind in long format
- status: update short status to respect --no-ahead-behind
- status: add --[no-]ahead-behind to status and commit for V2 format.
- stat_trac
Hi Jake,
On Mon, 26 Feb 2018, Jacob Keller wrote:
> On Mon, Feb 26, 2018 at 4:07 PM, Johannes Schindelin
> wrote:
> >
> > On Tue, 20 Feb 2018, Igor Djordjevic wrote:
> >
> >> I`m really interested in this topic, which seems to (try to) address the
> >> only "bad feeling" I had with rebasing merg
On 02/26, Jonathan Nieder wrote:
> Ævar Arnfjörð Bjarmason wrote:
> > On Sat, Feb 24 2018, Jeff King jotted:
>
> >> I actually wonder if we should just specify that the patterns must
> >> _always_ be fully-qualified, but may end with a single "/*" to iterate
> >> over wildcards. Or even simpler, t
On Fri, 23 Feb 2018 13:33:15 -0800
Brandon Williams wrote:
> On 02/21, Jonathan Tan wrote:
> > As someone who is implementing the server side of protocol V2 in JGit, I
> > now have a bit more insight into this :-)
> >
> > First of all, I used to not have a strong opinion on the existence of a
>
On Tue, Feb 27, 2018 at 1:58 AM, Nguyễn Thái Ngọc Duy wrote:
> v2 fixes the incorrect use of consecutive getenv() and adds a comment
> to clarify the role of old_gitdir
>
> Interdiff:
>
> diff --git a/environment.c b/environment.c
> index 95de419de8..47c6e31559 100644
> --- a/environment.c
> +++ b
On 02/12, Jonathan Nieder wrote:
> [...]
> > --- a/pkt-line.h
> > +++ b/pkt-line.h
> > @@ -111,6 +111,64 @@ char *packet_read_line_buf(char **src_buf, size_t
> > *src_len, int *size);
> > */
> > ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out);
> >
> > +struct packet_reader
Sergey Organov writes:
> You've already bit this poor thingy to death. Please rather try your
> teeth on the proposed Trivial Merge (TM) method.
Whatever you do, do *NOT* call any part of your proposal "trivial
merge", unless you are actually using the term to mean what Git
calls "trivial merge"
On 02/26, Jonathan Nieder wrote:
> Brandon Williams wrote:
>
> > Remove code duplication and use the existing 'get_refs_via_connect()'
> > function to retrieve a remote's heads in 'fetch_refs_via_pack()' and
> > 'git_transport_push()'.
> >
> > Signed-off-by: Brandon Williams
> > ---
> > transpo
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote:
> Construct a list of ref patterns to be passed to 'get_refs_list()' from
> the refspec to be used during the push. This list of ref patterns will
> be used to allow the server to filter the ref advertisement when
> communicating using proto
Hi,
Brandon Williams wrote:
> Add the 'shallow' feature to the protocol version 2 command 'fetch'
> which indicates that the server supports shallow clients and deepen
> requets.
>
> Signed-off-by: Brandon Williams
> ---
> Documentation/technical/protocol-v2.txt | 67 +++-
> serve.
On 02/27, Jonathan Tan wrote:
> On Fri, 23 Feb 2018 13:33:15 -0800
> Brandon Williams wrote:
>
> > On 02/21, Jonathan Tan wrote:
> > > As someone who is implementing the server side of protocol V2 in JGit, I
> > > now have a bit more insight into this :-)
> > >
> > > First of all, I used to not
On 02/26, Jonathan Nieder wrote:
> Hi,
>
> Brandon Williams wrote:
>
> > Introduce protocol_v2, a new value for 'enum protocol_version'.
> > Subsequent patches will fill in the implementation of protocol_v2.
> >
> > Signed-off-by: Brandon Williams
> > ---
>
> Yay!
>
> [...]
> > +++ b/builtin/f
On Mon, Feb 26, 2018 at 6:32 PM, Derrick Stolee wrote:
> This patch series is another big difference from version 4, but I do
> think we are converging on a stable design.
>
> This series depends on a few things in flight:
>
> * jt/binsearch-with-fanout for bsearch_graph()
>
> * 'master' includes
Hi Dscho,
On 27/02/2018 17:21, Johannes Schindelin wrote:
>
> Do you have any way to describe the idea in a simple, 3-5 lines long
> paragraph?
>
> So far, I just know that it is some sort of confusing criss-cross
> cherry-picking and merging and stuff, but nothing in those steps
> shouts out
On 02/27, Jonathan Nieder wrote:
I'll make the documentation changes you suggested.
> > +deepen
> > + Request that the fetch/clone should be shallow having a commit depth of
>
> nit: s/Request/Requests/, for consistency with the others?
>
> > +relative to the remote side.
>
> What d
Elijah Newren writes:
> patches. It's a trivial change and squashes cleanly, but if you're
> merging this series to next, I'm curious whether I should submit this
> change as a new patch on top of the series, if you'd prefer a full
> re-roll of the whole series, or something else.
If it is a tr
Brandon Williams wrote:
> On 02/12, Jonathan Nieder wrote:
>>> --- a/pkt-line.h
>>> +++ b/pkt-line.h
>>> @@ -111,6 +111,64 @@ char *packet_read_line_buf(char **src_buf, size_t
>>> *src_len, int *size);
>>> */
>>> ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out);
>>>
>>> +s
Brandon Williams wrote:
> On 02/26, Jonathan Nieder wrote:
>> Brandon Williams wrote:
>>> +++ b/transport.c
>>> @@ -230,12 +230,8 @@ static int fetch_refs_via_pack(struct transport
>>> *transport,
>>> args.cloning = transport->cloning;
>>> args.update_shallow = data->options.update_shallo
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote:
> When communicating with a v2 server, perform a fetch by requesting the
> 'fetch' command.
>
> Signed-off-by: Brandon Williams
> ---
> builtin/fetch-pack.c | 2 +-
> fetch-pack.c | 252
> +
On 02/26, Jonathan Nieder wrote:
> Brandon Williams wrote:
> > static char *server_capabilities;
> > +static struct argv_array server_capabilities_v2 = ARGV_ARRAY_INIT;
>
> Can a quick doc comment describe these and how they relate?
>
> Is only one of them set, based on which protocol version is
On 02/27, Stefan Beller wrote:
> > +
> > + /* Add initial haves */
> > + ret = add_haves(&req_buf, in_vain);
>
> I like the shortness and conciseness of this send_fetch_request
> function as it makes clear what is happening over the wire, however
> I wonder if we can improve on that, s
On 02/27, Jonathan Nieder wrote:
> Brandon Williams wrote:
> > On 02/26, Jonathan Nieder wrote:
> >> Brandon Williams wrote:
>
> >>> +++ b/transport.c
> >>> @@ -230,12 +230,8 @@ static int fetch_refs_via_pack(struct transport
> >>> *transport,
> >>> args.cloning = transport->cloning;
> >>> ar
On 27/02/2018 19:55, Igor Djordjevic wrote:
>
> It would be more along the lines of "(1) rebase old merge commit parents,
> (2) generate separate diff between old merge commit and each of its
> parents, (3) apply each diff to their corresponding newly rebased
> parent respectively (as a tempora
On 02/27, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
These could technically be removed in the previous patch, it may make
understanding what is happening in the previous patch a bit clearer too.
> ---
> repository.c | 45 -
> 1
On 02/27, Nguyễn Thái Ngọc Duy wrote:
> It does not make sense that generic repository code contains handling
> of environment variables, which are specific for the main repository
> only. Refactor repo_set_gitdir() function to take $GIT_DIR and
> optionally _all_ other customizable paths. These op
On 02/27, Nguyễn Thái Ngọc Duy wrote:
> getenv() is supposed to work on the main repository only. This delayed
> getenv() code in sha1_file.c makes it more difficult to convert
> sha1_file.c to a generic object store that could be used by both
> submodule and main repositories.
>
> Move the getenv
On 02/27, Nguyễn Thái Ngọc Duy wrote:
> This variable was added because the repo_set_gitdir() was created to
> cover both submodule and main repos, but these two are initialized a
> bit differently so ignore_env == 0 means main repo, while ignore_env
> != 0 is submodules.
>
> Since the difference
> @@ -76,10 +77,18 @@ static int graph_read(int argc, const char **argv)
>
> static int graph_write(int argc, const char **argv)
> {
> + const char **pack_indexes = NULL;
> + int packs_nr = 0;
> + const char **lines = NULL;
> + int lines_nr = 0;
> + int lines_alloc =
Junio C Hamano writes:
> Jeff King writes:
>
>> If I understand Gábor's patch correctly, it is using test_i18ngrep for
>> the specific lines we care about so that we don't have to worry about
>> other cruft lines that may or may not appear (including the hangup one).
>>
>> The downside is that w
Remove erroneous space between % and < in '% <()'.
Signed-off-by: Mårten Kongstad
---
Documentation/pretty-formats.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index e664c08..6109ef0 100644
--- a/Docum
Mårten Kongstad wrote:
> Remove erroneous space between % and < in '% <()'.
>
> Signed-off-by: Mårten Kongstad
> ---
> Documentation/pretty-formats.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Looks correct to me. The space was introduced in v1.8.3-rc0~22^2
(pretty: support %>>
Johannes Schindelin writes:
>> > Not quite. I have two more changes lined up. Let me send v4.
>>
>> Picked up and started looking at it. Thanks.
>
> FWIW v4's patches are identical to v5, but the interdiff as well as the
> pushed tags are completely broken in v4 (culprit: an error in my script
Hi, all:
This is an entirely idle pondering kind of question, but I wanted to
ask. I recently discovered that some edge providers are starting to
offer systems with GPU cards in them -- primarily for clients that need
to provide streaming video content, I guess. As someone who needs to run
a distr
SZEDER Gábor writes:
> The two test checking 'git mmerge-recursive' in an empty worktree in
> ...
> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
> export GIT_INDEX_FILE &&
> mkdir "$GIT_WORK_TREE" &&
> - git read-tree -i -m $c7 &&
> -
On Mon, Feb 26, 2018 at 03:46:35PM -0500, Jeff King wrote:
> On Mon, Feb 26, 2018 at 06:35:33PM +0100, Torsten Bögershausen wrote:
>
> > > diff --git a/userdiff.c b/userdiff.c
> > > index dbfb4e13cd..48fa7e8bdd 100644
> > > --- a/userdiff.c
> > > +++ b/userdiff.c
> > > @@ -161,6 +161,7 @@ IPATTERN
Junio C Hamano writes:
> SZEDER Gábor writes:
>
>> The two test checking 'git mmerge-recursive' in an empty worktree in
>> ...
>> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
>> export GIT_INDEX_FILE &&
>> mkdir "$GIT_WORK_TREE" &&
>> -git rea
SZEDER Gábor writes:
> + git read-tree -i -m $c3 2>actual-err &&
> + test_must_be_empty expected-err &&
> + git update-index --ignore-missing --refresh 2>>actual-err &&
> + test_must_be_empty expected-err &&
> + git merge-recursive $c0 -
Use is_null_oid() instead of is_null_sha1()
---
This is just a fixup to patch 23/29 in my v8 series for detecting directory
renames;
should squash cleanly.
merge-recursive.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index ffe1
On Tue, Feb 27, 2018 at 10:05:17PM +0100, Torsten Bögershausen wrote:
> The other question is:
> Would this help showing diffs of UTF-16 encoded files on a "git hoster",
> github/bitbucket/ ?
Almost. There's probably one more thing needed. We don't currently read
in-tree .gitattributes when d
The helper function test_must_be_empty is meant to make sure the
given file is empty, but its implementation is:
if test -s "$1"
then
... not empty, we detected a failure ...
fi
Surely, the file having non-zero size is a sign that the condition
"the file mu
On Tue, Feb 27, 2018 at 10:10 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> SZEDER Gábor writes:
>>
>>> The two test checking 'git mmerge-recursive' in an empty worktree in
>>> ...
>>> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
>>> export GIT_INDEX_FILE &&
Patches 2-4 are the actual fixes where I teach some functions to always
roll back the lock they're holding. Notably, these are all in "libgit".
Patch 1 is a "while at it" to use locks on the stack instead of having
them be static. Patch 5 removes code to roll back locks which are
already rolled ba
After 076aa2cbd (tempfile: auto-allocate tempfiles on heap, 2017-09-05),
we can have lockfiles on the stack.
One of these functions fails to always roll back the lock. That will be
fixed in the next commit.
Signed-off-by: Martin Ågren
---
sequencer.c | 10 +-
1 file changed, 5 insertion
This function originated in builtin/merge.c. It was moved to merge.c in
commit db699a8a1f (Move try_merge_command and checkout_fast_forward to
libgit.a, 2012-10-26), but was used from sequencer.c even before that.
If a problem occurs, the function returns without rolling back the
lockfile. Teach i
If `commit_lock_file()` or `hold_lock_file_for_update()` fail, there is
no need to call `rollback_lock_file()` on the lockfile. It doesn't hurt
either, but it does make different callers in this file inconsistent,
which might be confusing.
While at it, remove a trailing '.' from a recurring error
If we return early, we forget to roll back the lockfile. Do so.
Signed-off-by: Martin Ågren
---
sequencer.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 90807c4559..e6bac4692a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -465,8 +465,10 @
If we return early, we forget to roll back the lockfile. Do so.
Signed-off-by: Martin Ågren
---
merge-recursive.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index cc5fa0a949..7345125691 100644
--- a/merge-recursive.c
+++ b/merge-r
On Tue, Feb 27, 2018 at 06:47:04AM -0500, Derrick Stolee wrote:
> Peff made an excellent point about the nested if statements. This
> goes back to Christian's original recommendation.
>
> -- >8 --
>
> During abbreviation checks, we navigate to the position within a
> pack-index that an OID would
On 26 February 2018 at 22:29, Johannes Schindelin
wrote:
> As pointed out in a review of the `--recreate-merges` patch series,
> `rollback_lock_file()` clobbers errno. Therefore, we have to report the
> error message that uses errno before calling said function.
>
> Signed-off-by: Johannes Schinde
On Tue, Feb 27, 2018 at 1:27 PM, Junio C Hamano wrote:
> The helper function test_must_be_empty is meant to make sure the
> given file is empty, but its implementation is:
>
> if test -s "$1"
> then
> ... not empty, we detected a failure ...
> fi
>
> Surely,
On Tue, Feb 27, 2018 at 10:30:10PM +0100, Martin Ågren wrote:
> diff --git a/sequencer.c b/sequencer.c
> index 90807c4559..e6bac4692a 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -465,8 +465,10 @@ static int do_recursive_merge(struct commit *base,
> struct commit *next,
> fpu
On Tue, Feb 27, 2018 at 10:30:08PM +0100, Martin Ågren wrote:
> Patches 2-4 are the actual fixes where I teach some functions to always
> roll back the lock they're holding. Notably, these are all in "libgit".
>
> Patch 1 is a "while at it" to use locks on the stack instead of having
> them be st
Jeff King writes:
> Of the three solutions, I think the relative merits are something like
> this:
> ...
> 3. w-t-e (Lars's patch)
I thought Lars's w-t-e was about keeping the in-repo contents in
UTF-8 and externalize in whatever encoding (e.g. UTF-16), so it
won't help the issue hosting folks
Jonathan Nieder writes:
> Jonathan Tan wrote:
>> On Thu, 22 Feb 2018 13:26:58 -0500
>> Jeff King wrote:
>
>>> I agree that it shouldn't matter much here. But if the name argv_array
>>> is standing in the way of using it, I think we should consider giving it
>>> a more general name. I picked that
On Tue, Feb 27, 2018 at 01:55:02PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > Of the three solutions, I think the relative merits are something like
> > this:
> > ...
> > 3. w-t-e (Lars's patch)
>
> I thought Lars's w-t-e was about keeping the in-repo contents in
> UTF-8 and exter
On Tue, Feb 27, 2018 at 01:58:00PM -0800, Junio C Hamano wrote:
> Jonathan Nieder writes:
>
> > Jonathan Tan wrote:
> >> On Thu, 22 Feb 2018 13:26:58 -0500
> >> Jeff King wrote:
> >
> >>> I agree that it shouldn't matter much here. But if the name argv_array
> >>> is standing in the way of usin
Junio C Hamano writes:
> OK, somehow I had the version from Ramsay on a topic branch that was
> not merged to 'pu'. Here is the replacement for 2/2 I'd be queuing.
>
> We'd need SZEDER to sign it off (optionally correcting mistakes in
> the log message) if we are going with this solution.
>
> Th
On Tue, Feb 27, 2018 at 12:52 PM, Konstantin Ryabitsev
wrote:
> compression offload
Currently there is a series under review that introduces a commit graph
file[1], which would allow to not need decompressing objects for a rev walk, but
have the walking information as-needed on disk.
Once walkin
On Tue, Feb 27, 2018 at 01:27:29PM -0800, Junio C Hamano wrote:
> The helper function test_must_be_empty is meant to make sure the
> given file is empty, but its implementation is:
>
> if test -s "$1"
> then
> ... not empty, we detected a failure ...
> fi
>
> Sure
On 27 February 2018 at 22:44, Jeff King wrote:
> I want to note one thing that confused me while reviewing. While looking
> to see if there were other returns, I noticed that the lines right near
> the end of your context are funny:
>
> if (active_cache_changed &&
> write_loc
Jeff King writes:
> On Tue, Feb 27, 2018 at 01:55:02PM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > Of the three solutions, I think the relative merits are something like
>> > this:
>> > ...
>> > 3. w-t-e (Lars's patch)
>>
>> I thought Lars's w-t-e was about keeping the in-rep
On Tue, Feb 27, 2018 at 5:04 PM, Jeff King wrote:
> On Tue, Feb 27, 2018 at 01:58:00PM -0800, Junio C Hamano wrote:
>> So are we looking for a natural name to call an array of trings? I
>> personally do not mind argv_array too much, but perhaps we can call
>> it a string_array and then everybody
On Tue, Feb 27, 2018 at 11:08:12PM +0100, Martin Ågren wrote:
> > So I think it's correct as-is, but I wonder if writing it as:
> >
> > if (!active_cache_changed)
> > rollback_lock_file(&index_lock);
> > else if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
> > ret
On Tue, Feb 27, 2018 at 05:10:09PM -0500, Eric Sunshine wrote:
> > That would be fine with me. Though I would love it if we could find a
> > shorter name for the associated functions. For example,
> > argv_array_pushf() can make lines quite long, and something like
> > argv_pushf() is easier to re
On Tue, Feb 27, 2018 at 02:10:20PM -0800, Junio C Hamano wrote:
> > I thought it solved that by the hosting folks never seeing the strange
> > binary-looking data. They see only utf8, which diffs well.
>
> Ah, OK, that is a "fix" in a wider context (in a narrower context,
> "work around" is a mor
Jeff King writes:
> Thanks, this looks good to me.
>
> Semi-related, I wondered also at the weird asymmetry in the if-else,
> ...
> So I think the code is right, but the comment is wrong.
-- >8 --
From: Derrick Stolee
Date: Tue, 27 Feb 2018 06:47:04 -0500
Subject: [PATCH] sha1_name: fix unini
Phillip Wood writes:
> From: Phillip Wood
>
> Indent here documents in line with the current style for tests.
>
> Signed-off-by: Phillip Wood
> ---
This loses the hand-edit-while-queuing done based on Eric's comment
for the previous round (see what has been queued on 'pu' for quite a
while), w
On Mon, Feb 26, 2018 at 06:27:06PM +0100, tbo...@web.de wrote:
> @@ -3611,8 +3615,25 @@ int diff_populate_filespec(struct diff_filespec *s,
> unsigned int flags)
> s->size = size;
> s->should_free = 1;
> }
> - }
> - else {
> +
On Tue, Feb 27, 2018 at 02:30:39PM -0800, Junio C Hamano wrote:
> -- >8 --
> From: Derrick Stolee
> Date: Tue, 27 Feb 2018 06:47:04 -0500
> Subject: [PATCH] sha1_name: fix uninitialized memory errors
>
> During abbreviation checks, we navigate to the position within a
> pack-index that an OID wo
Phillip Wood writes:
> t/t3701-add-interactive.sh | 30 --
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index bdd1f292a9..46d655038f 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t
Brandon Williams wrote:
> Commit 266f1fdfa (transport-helper: be quiet on read errors from
> helpers, 2013-06-21) removed a call to 'die()' which printed the name of
> the remote helper passed in to the 'recvline_fh()' function using the
> 'name' parameter. Once the call to 'die()' was removed th
Brandon Williams wrote:
> Add the 'packet_buf_write_len()' function which allows for writing an
> arbitrary length buffer into a 'struct strbuf' and formatting it in
> packet-line format.
Makes sense.
[...]
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -26,6 +26,7 @@ void packet_buf_flush(struct st
Jeff King writes:
>> This code comes originally form 454fbbcde3 (git-rev-list: allow missing
>> objects when the parent is marked UNINTERESTING, 2005-07-10). But later,
>> in aeeae1b771 (revision traversal: allow UNINTERESTING objects to be
>> missing, 2009-01-27), we marked dealt with calling pa
Brandon Williams wrote:
> Store the protocol version the server responded with when performing
> discovery. This will be used in a future patch to either change the
> 'Git-Protocol' header sent in subsequent requests or to determine if a
> client needs to fallback to using a different protocol ve
Nguyễn Thái Ngọc Duy writes:
> ... and v5 fixes the commit message of 2/2 where in v4 it still
> mentions --stat-with-summary instead of --compact-summary. Sorry.
>
> Nguyễn Thái Ngọc Duy (2):
> diff.c: refactor pprint_rename() to use strbuf
> diff: add --compact-summary
Thanks, will queue.
1 - 100 of 161 matches
Mail list logo
