On Mon, Jul 27, 2015 at 5:18 PM, Duy Nguyen wrote:
> On Mon, Jul 27, 2015 at 2:39 PM, Jacob Keller wrote:
>> On Sun, Jul 26, 2015 at 5:39 PM, Duy Nguyen wrote:
>>> On Sun, Jul 26, 2015 at 11:08 AM, Eric Sunshine
>>> wrote:
>>>> You can generate an
This seems like a good thing to fix (i.e. make sure XX is not
ambiguous before creating it with "git checkout -b XX")
-- Forwarded message --
From: Andreas Beckmann
Date: Tue, Jul 28, 2015 at 9:18 PM
Subject: Bug#793884: git: allows nonsensical command 'git checkout -b HEAD'
To:
On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
wrote:
>> If the user wants whatever she types in the resulting commit
>> literally, there is the "--cleanup=" option, no?
>
> $ GIT_EDITOR=touch git commit --cleanup=verbatim
> [detached HEAD 1b136a7] # Please enter the commit message for your change
On Wed, Jul 29, 2015 at 7:17 PM, Matthieu Moy
wrote:
> Duy Nguyen writes:
>
>> On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
>> wrote:
>>>> If the user wants whatever she types in the resulting commit
>>>> literally, there is the "--cleanup=&quo
Jeff, I suppose you are the admin of git on scan.coverity, or knows
him/her, perhaps we can add a model for xmalloc to suppress these
"null pointer deferences" reports? We are sure xmalloc() never returns
NULL. Qemu did it [1] and it looks simple.. I think something like
this would do
void *xmallo
On Fri, Jul 31, 2015 at 12:13 PM, David Turner wrote:
> I should mention that other than that, skip-worktree + untracked cache
> seems to work fine.
Please go ahead and make a patch to allow it. I'll spend some more
time looking at this code. But I think it'll be fine.
--
Duy
--
To unsubscribe f
anged (i.e. valid) and assumes that .gitignore is
still there. Which is wrong. That's fixed in e931371 (untracked cache:
invalidate at index addition or removal - 2015-03-08).
With that out of the way,
Acked-by: Duy Nguyen
> Signed-off-by: David Turner
> ---
> dir.c
On Mon, Aug 3, 2015 at 5:18 PM, Duy Nguyen wrote:
> On Sat, Aug 1, 2015 at 12:35 AM, David Turner
> wrote:
>> Remove a check that would disable the untracked cache for sparse
>> checkouts. Add tests that ensure that the untracked cache works with
>> sparse checkouts --
On Sat, Aug 1, 2015 at 1:51 PM, Michael Haggerty wrote:
> For each worktree, we could then create a different view of the
> references by splicing parts of the full reference namespace together.
> This could even be based on config settings so that we don't have to
> hardcode information like "ref
On Sat, Aug 1, 2015 at 10:59 AM, Michael Haggerty wrote:
> Either way, there's also the question of who should know how to find the
> worktree-specific references--the program that wants to access them, or
> should there be a secret invisible mapping that is done on lookup, and
> that knows the fu
On Wed, Jul 29, 2015 at 5:50 AM, Johan Herland wrote:
> On Wed, Jul 29, 2015 at 12:12 AM, Junio C Hamano wrote:
>> David Turner writes:
>>> Prevent merges to the same notes branch from different worktrees.
>>> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
>>> code we use
On Fri, Jul 31, 2015 at 1:06 PM, David Turner wrote:
> Add a function ref_type, which categorizes refs as per-worktree,
> pseudoref, or normal ref.
For per-worktree refs, you probably should follow common_list[] in
path.c because that's how file-based ref namespace is splitted between
per-repo an
On Mon, Aug 3, 2015 at 8:02 PM, Duy Nguyen wrote:
> On Sat, Aug 1, 2015 at 10:59 AM, Michael Haggerty
> wrote:
>> Either way, there's also the question of who should know how to find the
>> worktree-specific references--the program that wants to access them, or
>
On Tue, Aug 4, 2015 at 2:49 AM, David Turner wrote:
> Simply treating refs/worktree as per-worktree, while the rest of refs/
> is not, would be a few dozen lines of code. The full remapping approach
> is likely to be a lot more. I've already got the lmdb backend working
> with something like this
This is a corner case that has a real use case:
git clone linux-2.6.git
cd linux-2.6
git remote add history git-history.git
git fetch history
# graft graft graft
Because history.gi and linux-2.6.git have nothing in common, the
server side keeps asking for more "have"s and the client keeps sending
First of all, sorry for my long silence. I'm going through my git
inbox now.
> diff --git a/dir.c b/dir.c
> index e7b89fe..314080b 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -631,6 +631,7 @@ static struct untracked_cache_dir
> *lookup_untracked(struct untracked_cache *uc,
> memset(d, 0, sizeof
On Thu, Aug 13, 2015 at 4:57 AM, David Turner wrote:
> +struct common_dir common_list[] = {
> + { "branches", 0, 1, 0 },
> + { "hooks", 0, 1, 0 },
> + { "info", 0, 1, 0 },
> + { "info/sparse-checkout", 0, 0, 1 },
> + { "logs", 1, 1, 0 },
> + { "logs/HEAD", 1, 1,
On Thu, Aug 13, 2015 at 4:57 AM, David Turner wrote:
> Instead of a linear search over common_list to check whether
> a path is common, use a trie. The trie search operates on
> path prefixes, and handles excludes.
Just be careful that the given key from git_path is not normalized. I
think you a
On Thu, Aug 13, 2015 at 4:57 AM, David Turner wrote:
> We need a place to stick refs for bisects in progress that is not
> shared between worktrees. So we use the refs/worktree/ hierarchy.
>
> The is_per_worktree_ref function and associated docs learn that
> refs/worktree/ is per-worktree, as doe
On Sun, Aug 9, 2015 at 9:11 PM, Karthik Nayak wrote:
> Add strbuf_utf8_align() which will align a given string into a strbuf
> as per given align_type and width. If the width is greater than the
> string length then no alignment is performed.
I smell an opportunity to reuse this code and kill som
On Thu, Aug 13, 2015 at 2:40 AM, René Scharfe wrote:
> Seriously, though: What kind of repository has that many files and uses the
> ZIP format to distribute snapshots? Just curious.
Not the "uses the zip format" part, but at least webkit and gentoo-x86
both exceed 64k limit. Even if we don't su
On Mon, Aug 10, 2015 at 4:27 PM, Jeff King wrote:
> The problem is that git_path uses a static buffer that gets overwritten
> by subsequent calls.
resolve_ref() was in the same boat, then we renamed it to
resolve_ref_unsafe(), I believe with an intention to eventually kill
it. But it lives on any
On Sat, Aug 8, 2015 at 1:12 AM, Ralf Thielow wrote:
> Hi,
>
> when a user made a typo, Git is not good in guessing what
> the user could have meant, except for git commands. I think
> this is an area with room for improvements.
> Let's look into branches. When I "clone --branch" and make
> a typo,
On Wed, Aug 5, 2015 at 7:47 PM, Ivan Chernyavsky wrote:
> Dear community,
>
> For some time I'm wondering why there's no "--grep" option to the "git
> branch" command, which would request to print only branches having specified
> string/regexp in their history.
Probably because nobody is intere
On Sun, Aug 16, 2015 at 12:17 PM, David Turner wrote:
> Previously, some calls lookup_untracked would pass a full path. But
> lookup_untracked assumes that the portion of the path up to and
> including to the untracked_cache_dir has been removed. So
> lookup_untracked would be looking in the unt
On Sun, Aug 16, 2015 at 12:04 PM, David Turner wrote:
> Duy Nguyen writes:
>> On Thu, Aug 13, 2015 at 4:57 AM, David Turner
> wrote:
>> > Instead of a linear search over common_list to check whether
>> > a path is common, use a trie. The trie search operates on
&
On Sun, Aug 16, 2015 at 7:16 PM, Duy Nguyen wrote:
> On Sun, Aug 16, 2015 at 12:17 PM, David Turner
> wrote:
>> Previously, some calls lookup_untracked would pass a full path. But
>> lookup_untracked assumes that the portion of the path up to and
>> including to the
On Tue, Aug 25, 2015 at 1:41 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> All callers except for two ask this function to die upon error by
>> passing fatal=1; turn the parameter to a more generic "unsigned flag"
>> bag of bits, introduce an explicit WRITE_FILE_GENTLY bit and change
>>
On Fri, Aug 21, 2015 at 6:36 PM, Joakim Tjernlund
wrote:
> I cannot push:
> # > git push origin
> Login for jo...@git.transmode.se
> Password:
> Counting objects: 7, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (7/7), done.
> Writing objects: 100% (7/7), 13.73 KiB |
On Fri, Aug 28, 2015 at 12:07 AM, David Turner wrote:
> Remove a cache invalidation which would cause the shared index to be
> rewritten on as-is commits.
>
> When the cache-tree has changed, we need to update it. But we don't
> necessarily need to update the shared index. So setting
> active_ca
On Wed, Aug 26, 2015 at 6:43 AM, Junio C Hamano wrote:
> ...
>
> I do not see a good way to do such a safe transition with command
> words approach, *unless* we are going to introduce new commands,
> i.e. "git list-tag", "git create-tag", etc.
I'm probably shot down for this. But could we go with
On Wed, Aug 26, 2015 at 3:28 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>
> Because? Title just tells what the patch meant to do (i.e. instead
> of returning it keeps looping), but does not say why it is a good
> idea. Besides, this a no-
On Wed, Aug 26, 2015 at 12:49 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> While commit 9f673f9 (gc: config option for running --auto in
>> background - 2014-02-08) helps reduce some complaints about 'gc
>> --auto' hogging the terminal, it creates another set of problems.
>>
>>
On Wed, Aug 26, 2015 at 12:39 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> I renamed both "flags" and "touched_flags" fields while making this
>> patch to make sure I was aware of how these flags were manipulated
>> (besides DIFF_OPT* macros). So hopefully I didn't miss anything
On Tue, Aug 25, 2015 at 11:38 PM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> This code is introduced in 23af91d (prune: strategies for linked
>> checkouts - 2014-11-30), and it's supposed to implement this rule from
>> that commit's message:
>>
>> - linked checkouts are supposed
On Mon, Sep 7, 2015 at 11:33 PM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>
> The cover letter talks about "local clone", and in this entire
> series, I saw new tests only for the local case, but doesn't this
> and the next change also
On Sun, Sep 13, 2015 at 8:04 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Mon, Sep 7, 2015 at 11:33 PM, Junio C Hamano wrote:
>>> Nguyễn Thái Ngọc Duy writes:
>>>
>>>> Signed-off-by: Nguyễn Thái Ngọc Duy
>>>> ---
>>&
On Thu, Sep 17, 2015 at 3:08 AM, Giuseppe Bilotta
wrote:
> Hello all,
>
> I've recently started to note an issue with git rebase -i failing with
> alarming frequency, especially on one of my repositories, claiming
> that index.lock could not be created because it exists, even though it
> doesn't a
On Wed, Sep 16, 2015 at 11:00 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> I'm not sure what behavior you want. At one point you say "puts the file
>> to a final place if it is non-empty" but later you say "leave it if
>> non-empty". Should the file be written directly, or should it
On Mon, Sep 14, 2015 at 10:37 PM, Joakim Tjernlund
wrote:
> On Mon, 2015-08-31 at 16:56 +0700, Duy Nguyen wrote:
>> On Fri, Aug 21, 2015 at 6:36 PM, Joakim Tjernlund
>> wrote:
>> > I cannot push:
>> > # > git push origin
>> > Login for jo...@git.tran
On Tue, Sep 15, 2015 at 12:15 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
>> index 473623d..889a72a 100644
>> --- a/Documentation/gitignore.txt
>> +++ b/Documentation/gitignore.txt
>> @@ -82,12 +82,9 @@ PATT
On Thu, Sep 3, 2015 at 5:00 PM, Johannes Schindelin
wrote:
> Hey all,
>
> yes, it is true: since mid-August I am working for Microsoft. Over a
> year ago, I got into contact with the Visual Studio Online group at
> Microsoft, of which I am now a happy member. A large part of my mission
> is to imp
On Thu, Sep 17, 2015 at 11:54 PM, Joakim Tjernlund
wrote:
> On Thu, 2015-09-17 at 20:18 +0700, Duy Nguyen wrote:
>> On Mon, Sep 14, 2015 at 10:37 PM, Joakim Tjernlund
>> wrote:
>> > On Mon, 2015-08-31 at 16:56 +0700, Duy Nguyen wrote:
>> > > On Fri, Aug 2
On Sat, Sep 19, 2015 at 9:21 AM, Duy Nguyen wrote:
> Even if you disable gc --auto and run it periodically (with
> cron or something), it will write gc.pid.
Ignore this sentence. Of course you can run manual gc using a
different user and with write access.
--
Duy
--
To unsubscribe fro
On Sun, Sep 27, 2015 at 5:01 AM, Andrey Loskutov wrote:
> ...
> Anyway, it would be nice to hear what should be the "right" way to interpret
> the tables above.
>
> BTW the only official documentation I found about ignore rules:
>
> https://www.kernel.org/pub/software/scm/git/docs/gitignore.html
On Fri, May 29, 2015 at 4:53 PM, Michael J Gruber
wrote:
> Isn't that basically the approach that "git checkout --to" is taking? Is
> that one "Windows proof"?
It should be.
> I've lost track of its status, though.
It should be fine to use as long as you don't do checkout --to on a
submodule. S
On Tue, May 26, 2015 at 9:54 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> --unshallow::
>> - If the source repository is complete, convert a shallow
>> - repository to a complete one, removing all the limitations
>> + If the source repository is
On Sun, May 31, 2015 at 07:16:29PM -0400, Spencer Baugh wrote:
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1237,6 +1237,7 @@ static int parse_branchname_arg(int argc, const char
> **argv,
> char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
> if (h
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller wrote:
> diff --git a/string-list.h b/string-list.h
> index d3809a1..88c18e9 100644
> --- a/string-list.h
> +++ b/string-list.h
> @@ -19,6 +19,7 @@ struct string_list {
> #define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL }
>
> void string_list_ini
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller wrote:
> @@ -127,6 +128,10 @@ int cmd_fetch_pack(int argc, const char **argv, const
> char *prefix)
> args.update_shallow = 1;
> continue;
> }
> + if (!skip_prefix(arg, "--t
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller wrote:
> Signed-off-by: Stefan Beller
> ---
>
> 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
On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller wrote:
> builtin/fetch-pack.c | 22 ++-
> fetch-pack.c | 109
> +++
> fetch-pack.h | 1 +
> 3 files changed, 80 insertions(+), 52 deletions(-)
And the companion changes in tr
On Tue, Jun 2, 2015 at 12:49 AM, Stefan Beller wrote:
> However the client side with builtin/fetch, builtin/fetch-pack, fetch-pack
> is a bit of a mystery to me, as I cannot fully grasp the difference between
> * connect.{h,c}
> * remote.{h.c}
> * transport.{h.c}
> there. All of it seems to be
On Thu, Jun 4, 2015 at 7:35 PM, Jeff King wrote:
> Commit c6458e6 (index-pack: kill union delta_base to save
> memory, 2015-04-18) refactored the comparison functions used
> in sorting and binary searching our delta list. The
> resulting code does something like:
>
> int cmp_offsets(off_t a, off
On Fri, Jun 5, 2015 at 4:45 PM, Jeff King wrote:
> On Fri, Jun 05, 2015 at 01:41:21AM +, brian m. carlson wrote:
>
>> However, with the object_id conversion, we run into a problem: casting
>> those unsigned char * values into struct object_id * values is not
>> allowed by the C standard. Ther
On Fri, Jun 5, 2015 at 4:32 PM, Ed Avis wrote:
> Torsten Bögershausen web.de> writes:
>
>>Do you think you can write a patch to improve the documentation ?
>
> Here is my attempt, but it is only a starting point.
>
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> i
On Fri, Jun 5, 2015 at 5:36 PM, Jeff King wrote:
> On Fri, Jun 05, 2015 at 05:14:25PM +0700, Duy Nguyen wrote:
>
>> I'm more concerned about breaking object_id abstraction than C
>> standard. Let's think a bit about future. I suppose we need to support
>> both
>From a thread on Hacker News. It seems that if a user does not have
access to the remote's reflog and accidentally forces a push to a ref,
how does he recover it? In order to force push again to revert it
back, he would need to know the remote's old SHA-1. Local reflog does
not help because remote
On Tue, Jun 9, 2015 at 11:29 PM, Johannes Schindelin
wrote:
> Sorry to chime in so late in the discussion, but I think that the
> `--force-with-lease` option is what you are looking for. It allows you to
> force-push *but only* if the forced push would overwrite the ref we expect,
> i.e. (simpl
On Tue, Jun 9, 2015 at 10:00 PM, brian m. carlson
wrote:
> On Tue, Jun 09, 2015 at 07:12:21PM +0700, Duy Nguyen wrote:
>> diff --git a/transport.c b/transport.c
>> index f080e93..6bd6a64 100644
>> --- a/transport.c
>> +++ b/transport.c
>> @@ -657,16 +657,17 @
On Tue, Jun 9, 2015 at 11:28 PM, brian m. carlson
wrote:
> diff --git a/sha1_file.c b/sha1_file.c
> index 7e38148..09f7f03 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -3173,6 +3173,11 @@ int has_sha1_file(const unsigned char *sha1)
> return find_pack_entry(sha1, &e);
> }
>
> +int
On Wed, Jun 10, 2015 at 9:00 PM, Jeff King wrote:
> On Tue, Jun 09, 2015 at 08:46:24PM -0700, Shawn Pearce wrote:
>
>> > This patch introduces a "quick" flag to has_sha1_file which
>> > callers can use when they would prefer high performance at
>> > the cost of false negatives during repacks. Ther
On Thu, Jun 11, 2015 at 2:05 AM, Jeff King wrote:
> On Wed, Jun 10, 2015 at 02:35:20PM -0400, Mike Edgar wrote:
>
>> When the user passes --depth to git-clone the server's capabilities are
>> not currently consulted. The client will send shallow requests even if
>> the server does not understand t
On Sun, Jun 14, 2015 at 12:18 AM, Sami Boukortt wrote:
> git: pathspec.c:317: prefix_pathspec: Assertion `item->nowildcard_len
> <= item->len && item->prefix <= item->len' failed.
Known issue, but no one stepped up to fix it yet
http://thread.gmane.org/gmane.comp.version-control.git/267095
--
D
On Sun, Jun 14, 2015 at 5:21 PM, Sami Boukortt wrote:
>> On Sun, Jun 14, 2015 at 12:18 AM, Sami Boukortt
>> wrote:
>> > git: pathspec.c:317: prefix_pathspec: Assertion
>> > `item->nowildcard_len <= item->len && item->prefix <= item->len'
>> > failed.
>>
>> Known issue, but no one stepped up to fi
On Thu, Apr 23, 2015 at 10:47 AM, Junio C Hamano wrote:
> On Wed, Apr 22, 2015 at 3:32 PM, Jens Lehmann wrote:
>> ...
>>> But it is unclear if we should still do (2) when "subrepo/.git" is
>>> no longer there. That has to be done manually and it may be an
>>> indication that is clear enough that
On Wed, Jun 17, 2015 at 2:54 PM, Torsten Bögershausen wrote:
> -git-checkout - Checkout a branch or paths to the working tree
> +git-checkout - Switch branches or restore changes
I didn't follow closely the previous discussion. Forgive me if this is
already discussed, but I would keep the "in the
On Wed, Jun 17, 2015 at 4:20 AM, Jeff King wrote:
> On Tue, Jun 16, 2015 at 03:49:07PM -0400, Jeff King wrote:
>
>> Another option would be to stop trying to intercept stdin in git.c, and
>> instead make this a feature of run-command.c. That is, right before we
>> exec a process, tee its stdin the
I think Coverity caught this correctly.
** CID 1306846: Memory - illegal accesses (USE_AFTER_FREE)
/builtin/pull.c: 287 in config_get_rebase()
*** CID 1306846: Memory - illegal accesses (
On Thu, Jun 18, 2015 at 2:58 AM, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
>> On 2015-06-17 21.23, Junio C Hamano wrote:
>> []
Basically, I'm fine with anything starting with "Switch branches or",
but please do change the headline ;-).
>>>
>>> Likewise; I agree "switch bran
On Wed, Jun 17, 2015 at 03:12:35PM -0400, Jeff King 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
On Thu, Jun 18, 2015 at 2:10 AM, Jeff King wrote:
> On Wed, Jun 17, 2015 at 05:04:04PM +0700, Duy Nguyen wrote:
>
>> I wonder if we could do it a bit differently. Instead of
>> GIT_TRACE_STDIN, I would add GIT_TRACE_HOOK that points to a script.
>> Whenever a comman
On Thu, Jun 18, 2015 at 09:46:09AM -0700, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > The last resort is simply filter out a whole class of warnings.
> > Probably good enough if both patches look equally ugly.
> >
> > -- 8< --
> > Subject: [PATCH] s
On Fri, Jun 19, 2015 at 5:50 PM, Remi Galan Alfonso
wrote:
> Duy Nguyen writes:
>
>> + sb.buf[0] = 'Z';
>> + printf("%c\n", strbuf_slopbuf[0]);
>> + return 0;
>> startup_info = &git_startup_info;
>
> I might be wrong, but I definitel
On Mon, Jun 22, 2015 at 2:20 AM, Charles Bailey wrote:
> From: Charles Bailey
>
> list-all-objects is a command to print the ids of all objects in the
> object database of a repository. It is designed as a low overhead
> interface for scripts that want to analyse all objects but don't require
> t
On Mon, Jun 22, 2015 at 9:29 PM, Patrick Higgins wrote:
> I like to use git to remove trailing whitespace from my files. I use
> the following ~/.gitconfig to make this convenient:
>
> [alias]
> wsadd = "!sh -c 'git diff -- \"$@\" | git apply --cached
> --whitespace=fix;\
>
On Tue, Jun 23, 2015 at 12:36 PM, Junio C Hamano wrote:
> "If there is interest"? Shut up and take my money ;-)
Yeah. This may be the next big thing since pack bitmap. It's even
better if it enters 'master' hand in hand with pack protocol v2, but I
think v2 needs more time.
On Tue, Jun 23, 2015
On Tue, Jun 23, 2015 at 5:54 PM, Jeff King wrote:
> diff --git a/builtin/prune.c b/builtin/prune.c
> index 0c73246..fc0c8e8 100644
> --- a/builtin/prune.c
> +++ b/builtin/prune.c
> @@ -218,6 +218,9 @@ int cmd_prune(int argc, const char **argv, const char
> *prefix)
> return 0;
>
On Tue, Jun 23, 2015 at 6:47 PM, Jeff King wrote:
> I was thinking of actually moving to a log-structured ref storage.
> Something like:
>
> - any ref write puts a line at the end of a single logfile that
> contains the ref name, along with the normal reflog data
>
> - the logfile is the s
On Wed, Jun 24, 2015 at 4:57 AM, Stefan Beller wrote:
> Linus Torvalds started a discussion[1] if we want to play rather safe
> than use defaults which make sense only for the most power users of Git:
>
>> So git is "safe" in the sense that you won't really lose any data,
>> but you may well be in
On Tue, Jun 23, 2015 at 11:50 PM, Junio C Hamano wrote:
>> This patch tightens the "exists in index" check, ignoring i-t-a
>> entries. For fixing the above problem, only the change in
>> check_to_create() is needed.
>
> And the first thing I noticed and found a bit disturbing was that
> this chang
On Wed, Jun 24, 2015 at 1:09 PM, Shawn Pearce wrote:
>>> I chose to use LMDB for the database. LMDB has a few features that make
>>> it suitable for usage in git:
>>
>> One of the complaints that Shawn had about sqlite is that there is no
>> native Java implementation, which makes it hard for JGi
On Wed, Jun 24, 2015 at 3:12 PM, Jeff King wrote:
> On Tue, Jun 23, 2015 at 06:54:11AM -0400, Jeff King wrote:
>
>> diff --git a/builtin/prune.c b/builtin/prune.c
>> index 0c73246..fc0c8e8 100644
>> --- a/builtin/prune.c
>> +++ b/builtin/prune.c
>> @@ -218,6 +218,9 @@ int cmd_prune(int argc, const
On Wed, Jun 24, 2015 at 5:38 PM, Bjørnar Snoksrud wrote:
> Summary:
> When creating a linked working directory with `git checkout --to`, you
> cannot clone from the local path. This works when cloning the main
> repository directory.
>
> I couldn't find anything the the documentation for `git chec
On Thu, Jun 25, 2015 at 12:05 AM, Junio C Hamano wrote:
> Internal "diff-index --cached" is used for another reason you did
> not mention (and scripted Porcelains literally use that externally
> for the same reason). When we start a mergy operation, we say it is
> OK if the working tree has local
On Fri, Jun 26, 2015 at 6:56 PM, Jeff King wrote:
> On Fri, Jun 26, 2015 at 05:37:35PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> This is where the "fun" is. The legacy behavior is, if $GIT_WORK_TREE is
>> not set but $GIT_DIR is, cwd is chosen as worktree's top. If you happen
>> to stand at worktree
On Thu, Jun 25, 2015 at 6:43 PM, Karthik Nayak wrote:
> Add support for %(refname:lalignX) where X is a number.
> This will print a shortened refname aligned to the left
> followed by spaces for a total length of X characters.
> If X is less than the shortened refname size, the entire
> shortened
On Tue, Jun 30, 2015 at 11:56 AM, Eric Sunshine wrote:
> The command "git checkout --to " is something of an anachronism,
> encompassing functionality somewhere between "checkout" and "clone".
> The introduction of the git-worktree command, however, provides a proper
> and intuitive place to house
On Wed, Jul 1, 2015 at 1:10 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> When "--" is lacking from the command line and a command can take both
>> revs and paths, the idea is if an argument can be seen as both an
>> extended SHA-1 and a path, then "--" is required or git refuses
On Mon, Jun 29, 2015 at 11:13 PM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Commit 23af91d (prune: strategies for linked checkouts - 2014-11-30)
>> adds "--worktrees" to "git prune" without realizing that "git prune" is
>> for object database only. This patch moves the same funct
On Tue, Jun 30, 2015 at 11:33 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> I think this is like "git checkout -b" vs "git branch". We pack so
>> many things in 'checkout' that it's a source of both convenience and
>> confusio
On Thu, Jul 2, 2015 at 12:13 AM, Eric Sunshine wrote:
>>I noticed GIT_CHECKOUT_NEW_WORKTREE environment variabl that does
>>not seem to be documented. Is this something we still need?
>>The log message of 529fef20 (checkout: support checking out into
>>a new working directory, 201
On Thu, Jul 2, 2015 at 9:52 AM, Eric Sunshine wrote:
> On Wed, Jul 1, 2015 at 9:07 PM, Duy Nguyen wrote:
>> On Thu, Jul 2, 2015 at 12:13 AM, Eric Sunshine
>> wrote:
>>>>I noticed GIT_CHECKOUT_NEW_WORKTREE environment variabl that does
>>>>not se
On Thu, Jul 2, 2015 at 7:41 PM, Duy Nguyen wrote:
>> merge_working_tree:
>> tree = parse_tree_indirect(old->commit &&
>> !opts->new_worktree_mode ?
>> old->commit->object.sha1 :
>> EMPTY_TREE_SHA1_BIN);
>
On Fri, Jul 3, 2015 at 12:06 AM, Eric Sunshine wrote:
>> Unless we want to borrow fancy checkout options for "git worktree
>> add", we probably should just export checkout() function from clone.c
>> and use it instead of "git checkout". Much more lightweight and
>> simpler (it's one-way merge). Th
On Fri, Jul 3, 2015 at 11:51 PM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Once we know the number of objects in the input pack, we allocate an
>> array of nr_objects of struct delta_entry. On x86-64, this struct is
>> 32 bytes long. The union delta_base, which is part of struct
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine wrote:
> +git-worktree could provide more automation for tasks currently
> +performed manually or via other commands, such as:
> +
> +- `add` to create a new linked worktree
> +- `remove` to remove a linked worktree and its administrative files (and
>
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine wrote:
> Given "git checkout --to HEAD~1", the new worktree's HEAD should
> begin life at the current branch's HEAD~1, however, it actually ends up
> at HEAD~2. The happens because:
>
> 1. git-checkout resolves HEAD~1
>
> 2. to satisfy is_git_
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine wrote:
> COMMANDS
>
> +add ::
> +
> +Check out `` into a separate working directory, ``, creating
> +`` if necessary. The new working directory is linked to the current
> +repository, sharing everything except working directory specific fil
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine wrote:
> Now that "git worktree add" has achieved user-facing feature-parity with
> "git checkout --to", retire the latter.
>
> Move the actual linked worktree creation functionality,
> prepare_linked_checkout() and its helpers, verbatim from checkout.
1 - 100 of 4016 matches
Mail list logo
