On some platforms, "p4 sync -f" will remove the workspace
directory after we have just created it; on some it won't.
This causes problems later when git finds itself in an
orphaned directory.
Workaround this by cd'ing back to the directory after
the "p4 sync -f".
Signed-off-by: Luke Diamand
---
This is a proposed fix for the problem reported by Jacob on OSX
where "p4 sync -f" removes the client directory.
http://www.spinics.net/lists/git/msg274356.html
I tried just moving the "cd", but lots of the tests then fail as
the "p4 sync" needs to be in the correct directory.
Luke Diamand (1):
On 04/27/2016 08:55 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> @@ -2380,8 +2381,8 @@ int rename_ref(const char *oldrefname, const char
>> *newrefname, const char *logms
>> goto rollback;
>> }
>>
>> -if (!read_ref_full(newrefname, RESOLVE_REF_READING, sha1,
Adding correct email for Jacob.
On 29 April 2016 at 08:40, Luke Diamand wrote:
> On some platforms, "p4 sync -f" will remove the workspace
> directory after we have just created it; on some it won't.
> This causes problems later when git finds itself in an
> orphaned directory.
>
> Workaround thi
On 04/27/2016 10:14 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> If the user has asked that a new value be set for a reference, we use
>> check_refname_format() to verify that the reference name satisfies all
>> of the rules. But in other cases, at least check that refname_is_safe().
Michael Haggerty writes:
> But I think it would be cleaner to achieve that goal with the following
> change:
>
> diff --git a/refs.c b/refs.c
> index 5dc2473..1d4c12a 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -790,8 +790,10 @@ int ref_transaction_update(struct ref_transaction
> *transaction,
>
Two things I forgot to say.
Michael Haggerty writes:
> I was thinking of this patch as documenting and enforcing a limitation
> in the current implementation of pruning.
This actually is an excellent point, and is the reason why I
repeatedly made my suggestion conditional on "If my understandin
Michael Haggerty writes:
>> Could you explain s/sha1/NULL/ here in the proposed log message?
>
> Good question.
>
> Passing sha1 to delete_ref() doesn't add any safety, because the same
> sha1 was just read a moment before, and it is not used for anything
> else.
"... and it is guaranteed that n
Michael Haggerty writes:
> On 04/27/2016 10:14 PM, Junio C Hamano wrote:
>> Michael Haggerty writes:
>>
>>> If the user has asked that a new value be set for a reference, we use
>>> check_refname_format() to verify that the reference name satisfies all
>>> of the rules. But in other cases, at l
From: Lars Schneider
Run "make doc" as separate Travis CI build job to check if all
documentation can be built without errors.
Signed-off-by: Lars Schneider
---
diff to v1:
* add quick sanity check to documentation results (thanks Matthieu)
* fix typo in commits message (thanks Stefan)
* move
On 04/29/2016 01:40 AM, David Turner wrote:
> On Wed, 2016-04-27 at 18:57 +0200, Michael Haggerty wrote:
> +retry:
> ...
>> +if (--attempts_remaining > 0)
>> +goto retry;
>
> could this be a loop instead of using gotos?
It certainly could. The goto-vs-loop question
On 04/29/2016 10:53 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>>> Could you explain s/sha1/NULL/ here in the proposed log message?
>>
>> Good question.
>>
>> Passing sha1 to delete_ref() doesn't add any safety, because the same
>> sha1 was just read a moment before, and it is not use
On Fri, Apr 29, 2016 at 12:57:29PM +0200, Michael Haggerty wrote:
> Remember, we're talking about rename_ref() only, not reference deletion
> in general. rename_ref() is not very robust anyway--it doesn't happen in
> a single transaction, and it is vulnerable to being defeated by
> simultaneous re
On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
> +# The follow numbers need to be adjusted when new documentation is added.
> +test_file_count html 233
> +test_file_count xml 171
> +test_file_count 1 152
This seems like it will be really flaky and a pain in the future.
Jeff King writes:
> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
>
>> +# The follow numbers need to be adjusted when new documentation is added.
>> +test_file_count html 233
>> +test_file_count xml 171
>> +test_file_count 1 152
>
> This seems like it will be really fl
Hi Peff,
On Thu, 28 Apr 2016, Jeff King wrote:
> On Thu, Apr 28, 2016 at 12:28:21PM -0700, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > It's definitely sufficient, it's just annoying if a user shows up
> > > every week and says "I want X.Y", and then somebody else shows up a
> > > w
Hi people.
I want to creat a git repo with two upstreams.
The first is the root of JointsWP (https://github.com/JeremyEnglert/JointsWP
) going straight to my root (repo /).
No problem with this upstream-jointswp.
The second is the sub dir /templates of WooComerce (
https://github.com/woothemes/w
Hi Junio,
On Thu, 28 Apr 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > - if (starts_with(var, "credential."))
> > + if (starts_with(var, "credential.") ||
> > + (starts_with(var, "http.") &&
> > + ends_with(var, ".extraheader"))
Hi Junio,
On Fri, 29 Apr 2016, Johannes Schindelin wrote:
> On Thu, 28 Apr 2016, Junio C Hamano wrote:
>
> > Johannes Schindelin writes:
> >
> > > - if (starts_with(var, "credential."))
> > > + if (starts_with(var, "credential.") ||
> > > + (starts_with(var, "http."
Hello,
I tried running a full profile build of Git 2.8.1, but it looks like
test #32 in `t7300-clean.sh` fails:
Commands:
> curl https://www.kernel.org/pub/software/scm/git/git-2.8.1.tar.xz | tar xJ
> cd git-2.8.1
> make prefix=/usr profile-install install-man -j18
Logs of test-suite that fails
Hi Jan,
On Fri, 29 Apr 2016, Jan Keromnes wrote:
> I tried running a full profile build of Git 2.8.1, but it looks like
> test #32 in `t7300-clean.sh` fails:
>
> Commands:
>
> > curl https://www.kernel.org/pub/software/scm/git/git-2.8.1.tar.xz | tar xJ
> > cd git-2.8.1
> > make prefix=/usr prof
On Fri, Apr 29, 2016 at 02:48:44PM +0200, Johannes Schindelin wrote:
> > If you know off-hand how to teach my vim to use your preferred indenting,
> > I'll gladly just brow-beat it into submission.
>
> For the record, I think the default in vim is to indent two tabs after an
> unclosed parenthesi
On Fri, Apr 29, 2016 at 02:29:25PM +0200, Johannes Schindelin wrote:
> The more I think about it, I actually think that we do the user a *really*
> great disservice by filtering the CONFIG_DATA_ENVIRONMENT. If I call
>
> git -c ... $cmd
>
> and that configuration is *not* picked up, it is
On Thu, Apr 28, 2016 at 03:44:50PM -0700, Junio C Hamano wrote:
> > I do not think "fetch" should grow submodule-specific
> > options,...
>
> The updated "git fetch" needs to grow submodule-specific options to
> at least either enable or disable "recurse into submodules", and
> that is true even
On 04/29/2016 02:12 PM, Jeff King wrote:
> On Fri, Apr 29, 2016 at 12:57:29PM +0200, Michael Haggerty wrote:
>
>> Remember, we're talking about rename_ref() only, not reference deletion
>> in general. rename_ref() is not very robust anyway--it doesn't happen in
>> a single transaction, and it is v
On Fri, Apr 29, 2016 at 03:55:00PM +0200, Michael Haggerty wrote:
> It's beyond the ambition of this patch to fix this old rename_ref()
> code, but...
> [...]
Thanks for the explanation. That all makes sense to me, and I can
definitely live with "historical warts that aren't worth touching in
thi
On Fri, Apr 29, 2016 at 12:23:57AM -0600, Brian Norris wrote:
> This should handle .gitconfig files that specify things like:
>
> [http]
> cookieFile = "~/.gitcookies"
Seems like a good idea, and the implementation looks obviously correct.
For the documentation:
> diff --git a/Documentat
> On 29 Apr 2016, at 14:21, Matthieu Moy wrote:
>
> Jeff King writes:
>
>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
>>
>>> +# The follow numbers need to be adjusted when new documentation is added.
>>> +test_file_count html 233
>>> +test_file_count xml 171
>>>
[Resend to list, sorry for the duplicates.]
> Executing `git-rev-parse` with `--git-common-dir`, `--git-path `,
> or `--shared-index-path` from the root of the main worktree results in
> a relative path to the git dir.
>
> When executed from a subdirectory of the main tree, however, it incorrectl
[Resend to list, sorry for the duplicates.]
> Signed-off-by: Michael Rappazzo
> ---
> t/t1500-rev-parse.sh | 37 +
> 1 file changed, 37 insertions(+)
>
> diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
> index 48ee077..1e220f7 100755
> --- a/t/t1500-
[Resend to list, sorry for the duplicates...]
> Adjust the incorrect expectation for `rev-parse --git-common-dir`.
>
> Add a test for `git rev-parse --git-path` executed from a linked
> worktree.
>
> Signed-off-by: Michael Rappazzo
> ---
> t/t2027-worktree-list.sh | 10 +-
> 1 file cha
On 04/29/2016 10:41 AM, Junio C Hamano wrote:
> [...Long, thoughtful comments omitted...]
> So perhaps your original might be the best version
> among those that have been discussed in this thread.
Very well. I'll also add a comment near the definition of REF_ISPRUNING
that it must only be used to
On Fri, Apr 29, 2016 at 04:22:05PM +0200, Lars Schneider wrote:
> >>> +# The follow numbers need to be adjusted when new documentation is added.
> >>> +test_file_count html 233
> >>> +test_file_count xml 171
> >>> +test_file_count 1 152
> [...]
> I agree, too. I wasn't sure about this check. That'
larsxschnei...@gmail.com writes:
> + before_install:
> + before_script: make doc
> + script: ci/test-documentation.sh
If you are to re-roll, I think before_script and script should be
merged, i.e. just write
script: ci/test-documentation.sh
and have ci/test-documentation.sh be:
From: Torsten Bögershausen
Add more test cases for the not normalized files ("NNO"). The
"text" attribute is most important, use it as the first parameter.
"ident", if set, is the second paramater followed by the eol
attribute. The eol attribute overrides core.autocrlf, which
overrides core.eol.
From: Torsten Bögershausen
Before this change,
$ echo "* text=auto" >.gitattributes
$ echo "* eol=crlf" >>.gitattributes
would have the same effect as
$ echo "* text" >.gitattributes
$ git config core.eol crlf
Having an "eol" attribute is taken as a declaration that the
path is text. This may
From: Torsten Bögershausen
Even though the configuration parser errors out when core.autocrlf
is set to 'input' when core.eol is set to 'crlf', there is no need
to do so, because the core.autocrlf setting trumps core.eol.
Allow all combinations of core.crlf and core.eol and document
that core.au
From: Torsten Bögershausen
When the content of a commited file is unchanged and the attributes
are changed, Git may not detect that the next commit must treat the
file as changed. This happens when lstat() doesn't detect a change,
since neither inode, mtime nor size are changed.
Add a single "Z
From: Torsten Bögershausen
Factor out the retrieval of the sha1 for a given path in
read_blob_data_from_index() into the function get_sha1_from_index().
This will be used in the next commit, when convert.c can do the
analyze for "text=auto" without slurping the whole blob into memory
at once.
A
From: Torsten Bögershausen
When statistics are done for the autocrlf handling, the search in
the content can be stopped, if e.g
- a search for binary is done, and a NUL character is found
- a search for CRLF is done, and the first CRLF is found.
Similar when statistics for binary vs non-binary a
From: Torsten Bögershausen
We define the working tree file is clean if either:
* the result of running convert_to_git() on the working tree
contents matches what is in the index (because that would mean
doing another "git add" on the path is a no-op); OR
* the result of running conv
From: Torsten Bögershausen
When the ident attributes is set, get_stream_filter() did not obey
core.autocrlf=true, and the file was checked out with LF.
Change the rule when a streaming filter can be used:
- if an external filter is specified, don't use a stream filter.
- if the worktree eol is C
From: Torsten Bögershausen
This patch extends the work done in commit c480539:
"Make it work also for un-normalized repositories". Make sure that CRLF
can be converted round trip, or don't convert them at all.
The old handling would treat a file as unchanged after checkout,
as long as it is not
From: Torsten Bögershausen
t6038 uses different code, dependig if NATIVE_CRLF is set ot not. When
the native line endings are LF, merge.renormalize is not tested very well.
Change the test to always use CRLF by setting core.eol=crlf.
After doing so, the test fails:
rm '.gitattributes'
rm 'contro
Michael Haggerty writes:
> On 04/29/2016 02:12 PM, Jeff King wrote:
>> On Fri, Apr 29, 2016 at 12:57:29PM +0200, Michael Haggerty wrote:
>>
>>> Remember, we're talking about rename_ref() only, not reference deletion
>>> in general. rename_ref() is not very robust anyway--it doesn't happen in
>>>
Michael Haggerty writes:
> Now lock_ref_sha1_basic() is only called with flags==REF_NODEREF. So we
> don't have to handle other cases anymore.
>
> This enables several simplifications, the most interesting of which come
> from the fact that ref_lock::orig_ref_name is now always the same as
> ref_
On Fri, Apr 29, 2016 at 10:12:12AM -0400, Jeff King wrote:
> On Fri, Apr 29, 2016 at 12:23:57AM -0600, Brian Norris wrote:
>
> > This should handle .gitconfig files that specify things like:
> >
> > [http]
> > cookieFile = "~/.gitcookies"
>
> Seems like a good idea, and the implementation lo
Hi Peff,
On Fri, 29 Apr 2016, Jeff King wrote:
> On Fri, Apr 29, 2016 at 02:48:44PM +0200, Johannes Schindelin wrote:
>
> > > If you know off-hand how to teach my vim to use your preferred indenting,
> > > I'll gladly just brow-beat it into submission.
> >
> > For the record, I think the defaul
0492eb4 fixed a broken &&-chain in this test which broke the test as it
checked for a wrong size. The expected size of the file under test is
39 bytes. The test checked that the size is 13 bytes. Fix the reference
value to make the test pass, again.
Signed-off-by: Lars Schneider
---
t/t9824-git-
Mike Hommey writes:
> Signed-off-by: Mike Hommey
I feel that this commit is under-explained. I think you should feel
entitled to boast the goodness this brings to us louder in the log
message.
It bothers me somewhat that this ended up copying, not moving, a bit
of code to call get-host-and-po
Mike Hommey writes:
> Signed-off-by: Mike Hommey
> ---
I think moving it out into a separate helper function is a very good
change to make the end result easier to follow.
Turning the helper to extern and adding it to connect.h does not
benefit us (and [PATCH 1/3] doesn't, either).
And in the
Stefan Beller writes:
> When there is no .gitmodules file availabe to initialize a submodule
> from, `submodule_from_path` just returns NULL. We need to check for
> that and abort gracefully. When `submodule init` was implemented in shell,
> a missing .gitmodules file would result in an error mes
On Fri, Apr 29, 2016 at 5:53 AM, Jan Keromnes wrote:
> Hello,
>
> I tried running a full profile build of Git 2.8.1, but it looks like
> test #32 in `t7300-clean.sh` fails:
>
> Commands:
>
>> curl https://www.kernel.org/pub/software/scm/git/git-2.8.1.tar.xz | tar xJ
>> cd git-2.8.1
>> make prefix=
Jeff King writes:
> I'm not sure if it's a good idea to go into so much detail about
> expand_user_path() here. There are a lot of options that use the same
> rules, and we probably don't want to go into a complete explanation
> inside each option's description. Is there a canonical definition of
Junio C Hamano writes:
> Mike Hommey writes:
>
>> Signed-off-by: Mike Hommey
>
> I feel that this commit is under-explained. I think you should feel
> entitled to boast the goodness this brings to us louder in the log
> message.
>
> It bothers me somewhat that this ended up copying, not moving
On Fri, Apr 29, 2016 at 10:11:48AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > I'm not sure if it's a good idea to go into so much detail about
> > expand_user_path() here. There are a lot of options that use the same
> > rules, and we probably don't want to go into a complete explana
On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy
wrote:
> Jeff King writes:
>
>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
>>
>>> +# The follow numbers need to be adjusted when new documentation is added.
>>> +test_file_count html 233
>>> +test_file_count xml 171
>>>
Jeff King writes:
> Yeah, this is what I had in mind. My only reservation would be that we
> need to make sure it is clear that this applies only to keys marked as
> taking a "pathname" type in the documentation. I'm suspect there are
> ones that are logically paths but do not currently do the ex
Lars Schneider writes:
> 0492eb4 fixed a broken &&-chain in this test which broke the test as it
> checked for a wrong size. The expected size of the file under test is
> 39 bytes. The test checked that the size is 13 bytes. Fix the reference
> value to make the test pass, again.
>
> Signed-off-b
Brian Norris writes:
> I mostly just copied from boilerplate on another option. IIRC, there
> were at least two other options that were documented similarly.
My quick grep didn't find 'another option' other than include.path,
but how about this as a preparatory step?
-- >8 --
Subject: [PATCH] c
On Fri, Apr 29, 2016 at 10:48:16AM -0700, Junio C Hamano wrote:
> Brian Norris writes:
>
> > I mostly just copied from boilerplate on another option. IIRC, there
> > were at least two other options that were documented similarly.
>
> My quick grep didn't find 'another option' other than include
Junio C Hamano writes:
> Brian Norris writes:
>
>> I mostly just copied from boilerplate on another option. IIRC, there
>> were at least two other options that were documented similarly.
>
> My quick grep didn't find 'another option' other than include.path,
> but how about this as a preparatory
Stefan Beller writes:
> On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy
> wrote:
>> Jeff King writes:
>>
>>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
>>>
+# The follow numbers need to be adjusted when new documentation is added.
+test_file_count html 233
Jeff King writes:
> On Fri, Apr 29, 2016 at 10:48:16AM -0700, Junio C Hamano wrote:
>
>> Brian Norris writes:
>>
>> > I mostly just copied from boilerplate on another option. IIRC, there
>> > were at least two other options that were documented similarly.
>>
>> My quick grep didn't find 'anoth
On Fri, Apr 29, 2016 at 10:55:00AM -0700, Junio C Hamano wrote:
> Thanks. Perhaps squash this to the patch in the message you are
> responding to.
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ff7eaaf..786e0fa 100644
> --- a/Documentation/config.txt
> +++ b/Documen
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> We define the working tree file is clean if either:
>
> * the result of running convert_to_git() on the working tree
> contents matches what is in the index (because that would mean
> doing another "git add" on the path is a no-op);
Stefan Beller writes:
> Reroute the output of stdout to stderr as it is just informative
> messages, not to be consumed by machines.
>
> We want to init submodules from the helper for `submodule update`
> in a later patch and the stdout output of said helper is consumed
> by the parts of `submodu
Stefan Beller writes:
> This is needed later to make a distinction between 'all specified'
> and the default group of submodules.
s/loose/lose/;
Again, this can be separated as an independent preliminary clean-up.
>
> Signed-off-by: Stefan Beller
> ---
> git-submodule.sh | 5 -
Stefan Beller writes:
> As submodule--helper list is the building block for some submodule
> commands (foreach, deinit, status, sync), also add tests for those.
The title is slightly misleading, isn't it?
This step only teaches the commands to limit the operation to the
defaultGroup instead of
Stefan Beller writes:
> We do not need to do anything special to initialize the `submodule_groups`
> pointer as the diff options setup will fill in 0 by default.
>
> Signed-off-by: Stefan Beller
> ---
> diff.c | 3 +++
> diff.h | 1 +
> 2 files changed, 4 insertions(+)
Isn't this going in the
On Fri, Apr 29, 2016 at 11:27 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Reroute the output of stdout to stderr as it is just informative
>> messages, not to be consumed by machines.
>>
>> We want to init submodules from the helper for `submodule update`
>> in a later patch and the st
Stefan Beller writes:
> Signed-off-by: Stefan Beller
> ---
Same comment as 11/15 applies here.
> git-submodule.sh | 5 +
> t/t7413-submodule--helper.sh | 26 ++
> 2 files changed, 31 insertions(+)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
>
On Thu, 2016-04-28 at 11:58 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > From: Nguyễn Thái Ngọc Duy
> > ...
> > The biggest gain is not having to verify the trailing SHA-1, which
> > takes lots of time especially on large index files. But this also
> > opens doors for further optimi
On Fri, Apr 29, 2016 at 11:37 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> We do not need to do anything special to initialize the `submodule_groups`
>> pointer as the diff options setup will fill in 0 by default.
>>
>> Signed-off-by: Stefan Beller
>> ---
>> diff.c | 3 +++
>> diff.h
On 29.04.16 02:43, Mike Hommey wrote:
> get_host_and_port(&ssh_host, &port);
> + if (!port)
> + port = get_port(ssh_host);
I'm not sure, if this is an improvement or not.
The original intention was, to check what the parser did, before
going out to
Jeff King writes:
> ... Having the two directly next to each other reads
> better to me. This is a pretty unusual diff, though, in that it did
> change the surrounding whitespace (and if you look further in the diff,
> the identical change is made elsewhere _without_ touching the
> whitespace). S
On 29 Apr 2016, at 19:34, Junio C Hamano wrote:
> Lars Schneider writes:
>
>> 0492eb4 fixed a broken &&-chain in this test which broke the test as it
>> checked for a wrong size. The expected size of the file under test is
>> 39 bytes. The test checked that the size is 13 bytes. Fix the refere
On 29 April 2016 at 21:29, Lars Schneider wrote:
>
> On 29 Apr 2016, at 19:34, Junio C Hamano wrote:
>
>> Lars Schneider writes:
>>
>>> 0492eb4 fixed a broken &&-chain in this test which broke the test as it
>>> checked for a wrong size. The expected size of the file under test is
>>> 39 bytes.
On 29 Apr 2016, at 19:27, Stefan Beller wrote:
> On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy
> wrote:
>> Jeff King writes:
>>
>>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote:
>>>
+# The follow numbers need to be adjusted when new documentation is added.
>>
[+Git, Junio]
On 29 April 2016 at 15:10, Jacob Smith wrote:
> That's the identical patch I'm maintaining internally; it appears to work.
Thanks, I think that counts as a "Tested-by" then.
Luke
>
> Sent from my iPhone
>
>> On Apr 29, 2016, at 8:52 AM, Luke Diamand wrote:
>>
>>> On 29 April 20
David Turner writes:
> Per working tree/repository, yes (not quite per-index because working
> trees with split indexes have two).
Heh, I consider "split index" merely an implementation detail of a
(logical) single index file that happens to be represented with two
physical files.
Anyway, thank
On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> ... Having the two directly next to each other reads
>> better to me. This is a pretty unusual diff, though, in that it did
>> change the surrounding whitespace (and if you look further in the diff,
>> the identical c
Lars Schneider writes:
>> This could be less of maintenance if we'd check with a "larger as" operator
>> such as
>>
>>test_file_count_more_than html 200
>>
>> using an arbitrary slightly smaller number.
>
> Well, I was thinking about testing against something like
> $(find . -type f -name
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> We define the working tree file is clean if either:
>
> * the result of running convert_to_git() on the working tree
> contents matches what is in the index (because that would mean
> doing another "git add" on the path is a no-op);
The latest maintenance release Git v2.8.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.8.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The 'master' branch now has the ei
Jacob Keller writes:
> On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote:
>> Jeff King writes:
>>
>>> ... Having the two directly next to each other reads
>>> better to me. This is a pretty unusual diff, though, in that it did
>>> change the surrounding whitespace (and if you look further i
On Fri, Apr 29, 2016 at 3:18 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano wrote:
>>> Jeff King writes:
>>>
... Having the two directly next to each other reads
better to me. This is a pretty unusual diff, though, in that it did
On Fri, 2016-04-29 at 15:35 -0700, Stefan Beller wrote:
> On Fri, Apr 29, 2016 at 3:18 PM, Junio C Hamano
> wrote:
> >
> > Jacob Keller writes:
> >
> > >
> > > On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano > > m> wrote:
> > > >
> > > > Jeff King writes:
> > > >
> > > > >
> > > > > ... H
> Currently it's an "opt in" knob, so this doesn't make sense to me.
+static int diff_compaction_heuristic = 1;
It's rather an opt-out knob going by the current
origin/jk/diff-compact-heuristic
> If
> we remove the entire knob as is, we can always (fairly easily) add it
> back. I would keep the
On Fri, 2016-04-29 at 15:44 -0700, Stefan Beller wrote:
> >
> > Currently it's an "opt in" knob, so this doesn't make sense to me.
> +static int diff_compaction_heuristic = 1;
>
Oops didn't know we'd made it default at some point. (all my versions
had it disabled by default)
> It's rather an op
On Tue, 2016-04-26 at 20:59 -0700, Stefan Beller wrote:
> On Mon, Apr 25, 2016 at 3:10 PM, Stefan Beller
> wrote:
> > On Mon, Apr 25, 2016 at 9:44 AM, David Turner <
> > dtur...@twopensource.com> wrote:
> > > On Wed, 2016-04-20 at 16:57 -0400, Jeff King wrote:
> > > > On Wed, Apr 20, 2016 at 04:46
On Fri, Apr 29, 2016 at 4:05 PM, David Turner wrote:
> On Tue, 2016-04-26 at 20:59 -0700, Stefan Beller wrote:
>> On Mon, Apr 25, 2016 at 3:10 PM, Stefan Beller
>> wrote:
>> > On Mon, Apr 25, 2016 at 9:44 AM, David Turner <
>> > dtur...@twopensource.com> wrote:
>> > > On Wed, 2016-04-20 at 16:57
On Fri, 2016-04-29 at 11:51 +0200, Michael Haggerty wrote:
> On 04/29/2016 01:40 AM, David Turner wrote:
> > On Wed, 2016-04-27 at 18:57 +0200, Michael Haggerty wrote:
> > +retry:
> > ...
> > > + if (--attempts_remaining > 0)
> > > + goto retry;
> >
> > could this be a loop
On Fri, 2016-04-29 at 09:38 +0200, Michael Haggerty wrote:
> On 04/27/2016 08:55 PM, Junio C Hamano wrote:
> > Michael Haggerty writes:
> >
> > > @@ -2380,8 +2381,8 @@ int rename_ref(const char *oldrefname,
> > > const char *newrefname, const char *logms
> > > goto rollback;
> > > }
>
Signed-off-by: Stefan Beller
---
fetch-pack.h | 1 +
remote.c | 2 ++
remote.h | 2 ++
transport-helper.c | 1 +
transport.c| 20 ++--
transport.h| 8
6 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/fetch-pack
In upload-pack-2 we send each capability in its own packet buffer.
The construction of upload-pack-2 is a bit unfortunate as I would like
it to not be depending on a symlink linking to upload-pack.c, but I did
not find another easy way to do it. I would like it to generate
upload-pack-2.o from uplo
Signed-off-by: Stefan Beller
---
t/t5520-pull.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 739c089..9bd1feb 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -599,4 +599,10 @@ test_expect_success 'git pull --rebase against local
branch'
As in the pack protocol version 2 we want to
negotiate the capabilities before any other exchange
we will have a function which will take care of the
whole negotiation process.
It will be placed in fetch-pack.c for now as there
we have access to its internal variables and we'll
work on a `struct f
1 - 100 of 148 matches
Mail list logo
