On Fri, Jul 10, 2015 at 11:57:28PM -0700, Junio C Hamano wrote:
> > So it is obviously a structure or variable that is being used so does anyone
> > know the library that this is defined in?
>
> Most of our objects should be found in libgit.a (you can see it on your
> command line) that our Makef
On Sat, Jul 11, 2015 at 11:14 PM, Eric Sunshine wrote:
> On Sat, Jul 11, 2015 at 11:10 PM, Eric Sunshine
> wrote:
>> On Sat, Jul 11, 2015 at 10:48 PM, Duy Nguyen wrote:
>>> The "shouldn't affect" is potentially a problem.If the current
>>> 'worktree add' process caches something (in ref handlin
On Sat, Jul 11, 2015 at 11:10 PM, Eric Sunshine wrote:
> On Sat, Jul 11, 2015 at 10:48 PM, Duy Nguyen wrote:
>> The "shouldn't affect" is potentially a problem.If the current
>> 'worktree add' process caches something (in ref handling, for example)
>> that the 'git branch' process changes, then w
On Sat, Jul 11, 2015 at 10:48 PM, Duy Nguyen wrote:
> On Sun, Jul 12, 2015 at 9:36 AM, Eric Sunshine
> wrote:
>> On Sat, Jul 11, 2015 at 9:20 PM, Duy Nguyen wrote:
>>> On Sat, Jul 11, 2015 at 7:05 AM, Eric Sunshine
>>> wrote:
The plan is eventually to populate the new worktree via "git r
On Sun, Jul 12, 2015 at 9:36 AM, Eric Sunshine wrote:
> On Sat, Jul 11, 2015 at 9:20 PM, Duy Nguyen wrote:
>> On Sat, Jul 11, 2015 at 7:05 AM, Eric Sunshine
>> wrote:
>>> The plan is eventually to populate the new worktree via "git reset
>>> --hard" rather than "git checkout". Thus, rather than
On Sat, Jul 11, 2015 at 9:20 PM, Duy Nguyen wrote:
> On Sat, Jul 11, 2015 at 7:05 AM, Eric Sunshine
> wrote:
>> The plan is eventually to populate the new worktree via "git reset
>> --hard" rather than "git checkout". Thus, rather than piggybacking on
>> git-checkout's -b/-B ability to create a
On Sat, Jul 11, 2015 at 7:05 PM, Karthik Nayak wrote:
> On Fri, Jul 10, 2015 at 9:50 PM, Junio C Hamano wrote:
>>
>> This may be enough to support the various existing formats that are
>> offered by "git branch" and/or "git tag", but I do not think if this
>> is the right approach in the longer t
On Sat, Jul 11, 2015 at 7:05 AM, Eric Sunshine wrote:
> The plan is eventually to populate the new worktree via "git reset
> --hard" rather than "git checkout". Thus, rather than piggybacking on
> git-checkout's -b/-B ability to create a new branch at checkout time,
> git-worktree will need to do
On Sat, Jul 11, 2015 at 11:26 AM, Ilari Liusvaara
wrote:
> On Sat, Jul 11, 2015 at 10:23:09AM -0700, Shawn Pearce wrote:
>>
>> > Websockets over HTTP/2 (a.k.a. "websockets2") has not been defined yet.
>> > With Websockets(1), it would probably already be possible to tunnel the
>> > native git smar
Le 10/07/2015 0:48, Jeff King a écrit :
On Thu, Jul 09, 2015 at 10:51:50PM +0200, Johannes Sixt wrote:
Ah! That code is less than a year old. When I began to adopt a workflow
requiring force-pushes lately, I wondered why I haven't seen these
failures earlier, because I did do force pushes in th
--
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
On Sat, Jul 11, 2015 at 10:23:09AM -0700, Shawn Pearce wrote:
> On Sat, Jul 11, 2015 at 12:00 AM, Ilari Liusvaara
> wrote:
> > On Sat, Jul 11, 2015 at 11:10:48AM +0800, ForceCharlie wrote:
> >
> >> Frequently used Git developers often feel Git HTTP protocol is not
> >> satisfactory, slow and unsta
On Sat, Jul 11, 2015 at 12:00 AM, Ilari Liusvaara
wrote:
> On Sat, Jul 11, 2015 at 11:10:48AM +0800, ForceCharlie wrote:
>> As we known, HTTP/2.0 has been released. All Git-Smart-HTTP are currently
>> implemented using HTTP/1.1.
>
> Nit: It is HTTP/2.
>
>> Frequently used Git developers often feel
Check if a matched token is followed by a delimiter before advancing the
pointer arg. This avoids accepting composite words like "allnew" or
"defaultcontext".
Signed-off-by: Rene Scharfe
---
diff.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 8
On Sat, Jul 11, 2015 at 2:56 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Fri, Jul 10, 2015 at 10:13 PM, Junio C Hamano wrote:
>>> Karthik Nayak writes:
>>>
Since 'ref-filter' only has an option to match path names
add an option for regular pattern matching.
>>>
>>> There i
On Fri, Jul 10, 2015 at 9:50 PM, Junio C Hamano wrote:
>
> This may be enough to support the various existing formats that are
> offered by "git branch" and/or "git tag", but I do not think if this
> is the right approach in the longer term, or if we are painting
> ourselves in a corner we cannot
Karthik Nayak writes:
> On Thu, Jul 9, 2015 at 6:28 PM, Matthieu Moy
> wrote:
>
>> I think this would deserve a test and documentation. Even though your
>> motivation is for an internal implementation, some users may want to use
>> the feature in 'git for-each-ref --format=...'.
>>
>
> I didn't
Karthik Nayak writes:
> On Fri, Jul 10, 2015 at 10:13 PM, Junio C Hamano wrote:
>> Karthik Nayak writes:
>>
>>> Since 'ref-filter' only has an option to match path names
>>> add an option for regular pattern matching.
>>
>> There is nothing "regular" about the pattern matching you are
>> adding
Hi Junio,
On 2015-07-11 00:45, Junio C Hamano wrote:
> * et/http-proxyauth (2015-06-29) 1 commit
> (merged to 'next' on 2015-07-09 at cf80874)
> + http: always use any proxy auth method available
>
> We used to ask libCURL to use the most secure authentication method
> available when talkin
Hi Chris,
On 2015-07-11 04:04, Chris Jones wrote:
> How does "You did not provide a valid range of commits.
> At least one tip in your range must be a ref." sound?
Maybe a bit shorter, as well as less accusing (which "You did not...!" may
sound):
filter-branch requires a valid commit rang
Nguyễn Thái Ngọc Duy writes:
> In the previous change in this function, we add locale support for
> single-byte encodings only. It looks like pcre only supports utf-* as
> multibyte encodings, the others are left in the cold (which is
> fine). We need to enable PCRE_UTF8 so pcre can parse the s
Now that git-worktree sets HEAD explicitly to its final value via either
git-symbolic-ref or git-update-ref, rather than relying upon
git-checkout to do so, the "hack" for pacifying is_git_directory() with
a temporary HEAD, though still necessary, can be simplified.
Since the real HEAD is now popu
The caller of add_worktree() provides it with a command to invoke to
populate the new worktree. This was a useful abstraction during the
conversion of "git checkout --to" functionality to "git worktree add"
since git-checkout and git-worktree constructed the population command
differently. However,
There is no reason to keep the strbuf active long after its last use.
By releasing it as early as possible, resource management is simplified
and there is less worry about future changes resulting in a leak.
Signed-off-by: Eric Sunshine
---
builtin/checkout.c | 7 +++
1 file changed, 3 inser
die_if_checked_out() is intended to check if the branch about to be
checked out is already checked out either in the main worktree or in a
linked worktree. However, if .git/worktrees directory does not exist,
then it never bothers checking the main worktree, even though the
specified branch might i
Now that git-worktree handles all functionality (--force, --detach,
-b/-B) previously delegated to git-checkout, actual population of the
new worktree can be accomplished more directly and more lightweight with
"git reset --hard" rather than "git checkout".
Signed-off-by: Eric Sunshine
---
built
git-worktree will eventually be retrofitted to populate the new worktree
via "git reset --hard" rather than "git checkout", at which time it will
need to be able to detect if the branch is already checked out
elsewhere, rather than relying upon git-branch to make this
determination, so publish die_
When --ignore-other-worktree is specified, we unconditionally skip the
check to see if the requested branch is already checked out in a linked
worktree. Since we know that we will be skipping that check, there is no
need to resolve HEAD in order to detect other conditions under which we
may skip th
Am 10.07.2015 um 22:50 schrieb Jeff King:
Thanks, this definitely is a problem, but we already have a fix in the
sb/p5310-and-chain topic. I thought that had been merged-up, but it
looks like it is only in "next" right now.
All the better. And I see it's in master now.
René
--
To unsubscribe
Be consistent with git-checkout which disallows this (not particularly
meaningful) combination.
Signed-off-by: Eric Sunshine
---
builtin/worktree.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 253382a..cd06bf5 100644
--- a/
The plan is to publish die_if_checked_out() so that callers other than
git-checkout can take advantage of it, however, those callers won't have
access to git-checkout's "struct branch_info". Therefore, change it to
accept the full name of the branch as a simple string instead.
While here, also giv
This is a follow-on series to [1], which migrated "git checkout --to"
functionality to "git worktree add". That series continued using "git
checkout" for the initial population of the new worktree, which required
git-checkout to have too intimate knowledge that it was operating in a
newly created w
Now that git-worktree no longer relies upon git-checkout to perform
initial population of the new worktree, git-checkout no longer needs
intimate knowledge that it may be working on a newly created worktree.
Therefore, drop 'new_worktree_mode' and the private
GIT_CHECKOUT_NEW_WORKTREE environment v
The plan is eventually to populate the new worktree via "git reset
--hard" rather than "git checkout". Thus, rather than piggybacking on
git-checkout's -b/-B ability to create a new branch at checkout time,
git-worktree will need to do so itself.
Signed-off-by: Eric Sunshine
---
I considered cal
On Sat, Jul 11, 2015 at 11:10:48AM +0800, ForceCharlie wrote:
> As we known, HTTP/2.0 has been released. All Git-Smart-HTTP are currently
> implemented using HTTP/1.1.
Nit: It is HTTP/2.
> Frequently used Git developers often feel Git HTTP protocol is not
> satisfactory, slow and unstable.This i
The eventual goal is for git-worktree to populate the new worktree via
"git reset --hard" rather than "git checkout". As a consequence,
git-worktree will no longer be able to rely upon git-branch to determine
the state of the worktree (detached or branch symref), or to check for
error conditions, s
check_linked_checkouts() doesn't just "check" linked checkouts for
"something"; specifically, it aborts the operation if the branch about
to be checked out is already checked out elsewhere. Therefore, rename it
to die_if_checked_out() to give a better indication of its function.
The more meaningful
37 matches
Mail list logo
