On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine wrote:
> One of git-worktree's roles is to populate the new worktree, much like
> git-checkout, and thus, for convenience, ought to support several of the
> same shortcuts. Toward this goal, add -b/-B options to create a new
> branch and check it out i
On Sat, Jul 4, 2015 at 3:54 PM, Eric Sunshine wrote:
> On Fri, Jul 3, 2015 at 10:53 PM, Duy Nguyen wrote:
>> On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine
>> wrote:
>>> COMMANDS
>>>
>>> +add ::
>>> +
>>> +Check out `
On Mon, Jul 6, 2015 at 6:28 PM, Plamen Totev wrote:
> Hello,
>
> It looks like the git grep command does not support multi-byte character sets
> like UTF-8. As a result some of the grep functionality is not working. For
> example if you search for non Latin words the ignore case flag does not ha
On Tue, Jul 7, 2015 at 3:10 AM, René Scharfe wrote:
> Am 06.07.2015 um 14:42 schrieb Nguyễn Thái Ngọc Duy:
>>
>> Noticed-by: Plamen Totev
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> grep.c | 14 +++---
>> 1 file changed, 11 insertions(+), 3 deletions(-)
>>
>> diff --git a/grep.c
On Sun, Jul 5, 2015 at 5:30 AM, Junio C Hamano wrote:
> When c6458e60 (index-pack: kill union delta_base to save memory,
> 2015-04-18) attempted to reduce the memory footprint of index-pack,
> one of the key thing it did was to keep track of ref-deltas and
> ofs-deltas separately.
>
> In fix_unres
efactor would be needed.
"git grep regcomp" reveals some many places. Many some of them would
benefit from kws if we provide this new function you mentioned.
> Regards,
> Plamen Totev
>
>
>
>> Оригинално писмо
>>От: Duy Nguyen pclo...@gmail.com
>>Относно: Re: Gi
On Wed, Jul 8, 2015 at 1:08 AM, Plamen Totev wrote:
> Junio C Hamano writes:
>
>> Plamen Totev writes:
>>
>> > pickaxe search also uses kwsearch so the case insensitive search with
>> > it does not work (e.g. git log -i -S). Maybe this is a less of a
>> > problem here as one is expected to searc
On Wed, Jul 8, 2015 at 5:38 PM, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/grep.c b/grep.c
> index 8fce54f..c79aa70 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -324,11 +324,13 @@ static void compile_pcre_regexp(struct grep_pat *p,
> const struct grep_opt *opt)
> int erroffset;
> int
On Wed, Jul 8, 2015 at 6:32 PM, Torsten Bögershausen wrote:
> On 2015-07-08 12.38, Nguyễn Thái Ngọc Duy wrote:
>> Side note, I almost added the third has_non_ascii() function. Maybe we
>> should consider merging the two existing has_non_ascii() functions
>> back, or rename one to something else.
>
On Wed, Jul 8, 2015 at 7:28 PM, Ævar Arnfjörð Bjarmason
wrote:
> Someone at work came to me with the problem that they were getting the
> "Auto packing the repository in background for optimum performance"
> notice on every Git command that they ran.
>
> This problem is a combination of two things
On Wed, Jul 8, 2015 at 8:47 PM, Jeff King wrote:
> On Wed, Jul 08, 2015 at 06:56:31PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> This is to avoid the too generic name "type" and harmonize with the
>> naming in index-pack. There's a subtle difference though: real_type in
>> index-pack is what the uppe
On Wed, Jul 8, 2015 at 10:36 PM, Junio C Hamano wrote:
>> Patch 5 is "funny". The patch itself is in iso-8859-1, but my name in
>> the commit message is in utf-8.
>
> As an e-mail message is a single file, by definition that is not merely
> "funny" but just "broken", no matter what encoding your M
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 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 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&quo
On Sun, Jul 12, 2015 at 8:47 AM, Duy Nguyen wrote:
> Another thing, the atom value is also used for sorting. When used for
> sorting, I think these padding spaces should not be generated or it
> may confuse the sort algorithm. Left alignment may be ok, right or
> center alignmen
On Thu, Jun 25, 2015 at 6:43 PM, Karthik Nayak wrote:
> Add support to sort by version using the "v:refname" and
> "version:refname" option. This is achieved by using the
> 'version_cmp()' function as the comparing function for qsort.
If these v:refname and version:refname are from git-tag, you m
On Thu, Jul 9, 2015 at 5:58 PM, Karthik Nayak wrote:
> -static int show_reference(const char *refname, const struct object_id *oid,
> - int flag, void *cb_data)
> -{
...
> -
> - if (match_pattern(filter->name_patterns, refname)) {
> - printf("%-15s
(resend, +everybody)
On Sun, Jul 12, 2015 at 10:27 AM, Eric Sunshine wrote:
>>> So, if I understand your concern correctly, then you are worried that,
>>> following the git-branch invocation, ref_exists() could return the
>>> wrong answer with a pluggable ref-backend since it might be answering
>
On Mon, Jul 13, 2015 at 2:36 AM, Karthik Nayak wrote:
> What I was thinking of was getting rid of the whole "align" feature where
> you provide a value to which it would align.
>
> Something like: --format="%(item:modifieralign)" which would use something
> on the lines of what the max-width calc
On Mon, Jul 13, 2015 at 2:56 AM, Karthik Nayak wrote:
> On Sun, Jul 12, 2015 at 7:17 AM, Duy Nguyen wrote:
>>
>> I guess if you can have multiple arguments after ':' in an atom, then
>> you have wiggle room for future. But it looks like you only accept one
>>
On Tue, Jul 14, 2015 at 4:53 PM, Michael J Gruber
wrote:
> Related to that, I'm interested in "worktree list", and I'm wondering
> how many more worktree commands we foresee, and therefore how much
> refactoring should be done: Currently, the parsing of the contents of
> .../worktrees/ into worktr
On Tue, Jul 14, 2015 at 11:42 PM, Torsten Bögershausen wrote:
> (I haven't been able to do more debugging yet,
> but this doesn't fully work on my Mac OS X box:)
>
> Initialized empty Git repository in
> /Users/tb/NoBackup/projects/git/tb.150714_Duy_grep_utf8/t/trash
> directory.t7812-grep-icase-n
On Wed, Jul 15, 2015 at 1:48 PM, Eric Sunshine wrote:
>> - check_linked_checkout() when trying to decide what branch is
>>checked out assumes HEAD is always a regular file, but I do not
>>think we have dropped the support of SYMLINK_HEAD yet. It needs
>>to check st_mode and readlink(
On Wed, Jul 15, 2015 at 11:40:18AM +0200, Bjørnar Snoksrud wrote:
> I reported this before, but now I have a nice topic to hang it on -
>
> I have re-reproduced the bug using a build from master as of today,
> using the new worktree commands.
Something like the following patch should work if you
On Thu, Jul 16, 2015 at 6:13 AM, Junio C Hamano wrote:
> I've tried to set up a non-bare clone of git.git at ~/w/src and
> attached one of its branches to a separate work tree at ~/w/rerere
>
> ~/w/src$ git worktree add ../rerere jc/rerere
>
> Then I tried the "multiple checkout not allowed".
>
>
On Fri, Jul 17, 2015 at 3:39 AM, Junio C Hamano wrote:
> Also in a linked checkout of git.git itself, t5601.21 seems to fail
> with:
>
> fatal: Not a git repository: /home/gitster/w/src/.git/worktrees/rerere
> not ok 21 - clone respects global branch.autosetuprebase
> #
> # (
> #
On Fri, Jul 17, 2015 at 7:32 AM, Eric Sunshine wrote:
>> In the new world order with GIT_DIR and GIT_COMMON_DIR, does
>> "$GIT_DIR" always have to be the same as "$GIT_WORK_TREE/.git"? Do
>> we need some sanity check if that is the case? Perhaps: if you have
>> $GIT_DIR set to $somewhere/.git/wo
On Fri, Jul 17, 2015 at 7:27 PM, Michael J Gruber
wrote:
> Two more observations:
>
> $ git worktree add /tmp/gitwt
> Enter /tmp/gitwt (identifier gitwt)
> Switched to a new branch 'gitwt'
>
> Now I'm in /tmp/gitwt at branch gitwt. Right? No. I'm in the original wd
> at the original branch.
>
> So
On Sat, Jul 18, 2015 at 12:03 AM, Junio C Hamano wrote:
> The other one is more heavy. Do we even want to have and expose
> GIT_COMMON_DIR environment variable?
>
> The primary reason why we added GIT_DIR, GIT_OBJECT_DIRECTORY
> etc. in the early days of Git was because we didn't exactly know
> w
On Fri, Jul 17, 2015 at 05:19:27PM -0400, David Turner wrote:
> Don't update files in the worktree from cache entries which are
> flagged with CE_WT_REMOVE.
>
> When a user does a sparse checkout, git removes files that are marked
> with CE_WT_REMOVE (because they are out-of-scope for the sparse
>
On Sun, Jul 26, 2015 at 11:08 AM, Eric Sunshine wrote:
> You can generate an interdiff with "git diff branchname-v4
> branchname-v5", for instance.
Off topic. But what stops me from doing this often is it creates a big
mess in "git tag -l". Do we have an option to hide away some
"insignificant:"
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 interdiff with "git diff branchname-v4
>>> branchname-v5&quo
On Mon, Jul 27, 2015 at 6:48 PM, Patrick Steinhardt wrote:
> When cloning a repository from a server's root, that is the URL's
> path component is a '/' only, we fail to generate a sensible
> repository name when the URL contains authentication data. This
> is especially bad when cloning URLs like
On Tue, Jul 28, 2015 at 6:25 AM, Eric Sunshine wrote:
> On Mon, Jul 27, 2015 at 7:38 AM, Ed Avis wrote:
>> git commit will happily let you specify log messages beginning with #.
>> But then on git rebase -i, when squashing some commits, the editing for the
>> combined log message treats lines beg
On Tue, Jun 21, 2016 at 2:10 PM, Jeff King wrote:
> ...
> So this request actually takes _two_ upload-pack instances to serve
> (which is not uncommon when we need multiple rounds of
> get_common_commits(), though I am a little surprised that would be the
> case for a clone). And the first one see
On Sun, Jun 19, 2016 at 12:00 PM, Jeff King wrote:
> Stefan, I think it might be worth revisiting the default set by d22eb04
> to propagate shallowness from the super-project clone. In an ideal
> world, we would be asking each submodule for the actual commit we are
> interested in, and shallowness
On Wed, Jun 22, 2016 at 3:13 AM, Eric Sunshine wrote:
> On Tue, Jun 21, 2016 at 5:14 PM, Charles Bailey wrote:
>> From: Charles Bailey
>>
>> This reverts commit 4d552005323034c1d6311796ac1074e9a4b4b57e and adds an
>> alternative fix to maintain the -L --cached behavior.
>
> It is common to provi
On Wed, Jun 22, 2016 at 12:49 AM, Junio C Hamano wrote:
>> @@ -396,7 +396,7 @@ static int grep_cache(struct grep_opt *opt, const struct
>> pathspec *pathspec, int
>>* cache version instead
>>*/
>> if (cached || (ce->ce_flags & CE_VALID) ||
>> ce_skip
On Sat, Jun 18, 2016 at 2:26 AM, Duy Nguyen wrote:
> On Sat, Jun 18, 2016 at 6:17 AM, Junio C Hamano wrote:
>> Nguyễn Thái Ngọc Duy writes:
>>
>>> v6 fixes comments from Ramsay and Eric. Interdiff below.
>>
>> Another thing I noticed with this is that t
On Wed, Jun 22, 2016 at 8:00 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>>> So I wonder if a better change would be more like
>>>
>>> for (...) {
>>> if (!S_ISREG(ce->ce_mode))
>>> con
On Wed, Jun 22, 2016 at 8:36 PM, Junio C Hamano wrote:
> On Wed, Jun 22, 2016 at 11:29 AM, Duy Nguyen wrote:
>>
>> Can any shell wizards explain this to me? With this code
>>
>> BS=\\
>> echo ${BS}${BS}
>>
>> Debian's dash returns a single backsl
The story started with my problem on Debian, which I didn't have and
didn't want to install a Debian VM just for that problem. So I made a
docker image with the following script.
Which makes me think, could we use something like this to make sure
people (on Linux) can test more obscure cases? Some
On Wed, Jun 22, 2016 at 9:59 PM, Jeff King wrote:
> On Wed, Jun 22, 2016 at 09:01:55PM +0200, Duy Nguyen wrote:
>
>> Which makes me think, could we use something like this to make sure
>> people (on Linux) can test more obscure cases? Sometimes there are
>> featues that r
On Thu, Jun 23, 2016 at 8:24 AM, David Turner wrote:
> So I'll remove it and re-roll (with some other changes)
Please hold it for a few days. I wanted to have another look at this
series, but I've been busy. I should be able to really look at it this
weekend.
--
Duy
--
To unsubscribe from this l
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> Of course, as soon as I pinged on the previous version, I noticed an issue.
> ...
A bit off-topic, but you may want to cut a release for libwatchman
(even 0.1.0 would do) so it can be properly packaged.
--
Duy
--
To unsubscribe from this li
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> +int packet_flush_gently(int fd)
> +{
> + packet_trace("", 4, 1);
> + return write_in_full(fd, "", 4) != 4;
> +}
The return value convention here is a bit weird, isn't it? Usually we
have "zero good, minus one (or negati
On Fri, Jun 17, 2016 at 6:43 PM, Christian Couder
wrote:
> On Thu, May 19, 2016 at 11:45 PM, David Turner
> wrote:
>> From: Nguyễn Thái Ngọc Duy
>>
>> +static void loop(int fd, int idle_in_seconds)
>> +{
>> + assert(idle_in_seconds < INT_MAX / 1000);
>
> This assert may not be very nice t
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> .gitignore | 1 +
> Documentation/git-index-helper.txt | 50 ++
> Makefile | 5 +
> cache.h| 11 ++
> contrib/completion/git-completion.b
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> +--strict::
> +--no-strict::
> + Strict mode makes index-helper verify the shared memory after
> + it's created. If the result does not match what's read from
> + $GIT_DIR/index, the shared memory is destroyed. This makes
>
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> From: Nguyễn Thái Ngọc Duy
>
> We detach after creating and opening the socket, because otherwise
> we might return control to the shell before index-helper is ready to
> accept commands. This might lead to flaky tests.
Another good reason
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> @@ -1222,8 +1225,13 @@ int refresh_index(struct index_state *istate, unsigned
> int flags,
> continue;
>
> new = refresh_cache_ent(istate, ce, options, &cache_errno,
> &changed);
> - if
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> From: Nguyễn Thái Ngọc Duy +"poke ":
The new format is "poke ".
> + Like "poke", but replies with "OK". If the index has the
> + watchman extension, index-helper queries watchman, then
> + prepares a shared memory objec
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> @@ -1149,6 +1152,19 @@ int cmd_update_index(int argc, const char **argv,
> const char *prefix)
> die("Bug: bad untracked_cache value: %d", untracked_cache);
> }
>
> + if (use_watchman > 0) {
> + th
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> @@ -417,6 +418,7 @@ int main(int argc, char **argv)
> "verify shared memory after creating"),
> OPT_BOOL(0, "detach", &detach, "detach the process"),
> OPT_BOOL(0, "kill", &kill, "reque
On Thu, May 19, 2016 at 11:45 PM, David Turner wrote:
> +static void autorun_index_helper(void)
> +{
> + const char *argv[] = {"git-index-helper", "--detach", "--autorun",
> NULL};
> + if (want_auto_index_helper() <= 0)
> + return;
> +
> + trace_argv_printf(argv, "
On Sat, Jun 25, 2016 at 3:28 PM, Duy Nguyen wrote:
> On Thu, May 19, 2016 at 11:45 PM, David Turner
> wrote:
>> Of course, as soon as I pinged on the previous version, I noticed an issue.
>> ...
>
> A bit off-topic, but you may want to cut a release for libwatchman
>
On Sat, Jun 25, 2016 at 9:21 PM, David Turner wrote:
> On 06/25/2016 10:33 AM, Duy Nguyen wrote:
>>>
>>> + /*
>>> +* Our connection to the client is blocking since a
>>> client
>>> +
On Mon, Jun 27, 2016 at 6:33 AM, Eric Sunshine wrote:
> On Sun, Jun 26, 2016 at 1:58 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> In the "remote -> local" line, if either ref is a substring of the
>> other, the common part in the other string is replaced with "$". For
>> example
>>
>> abc
On Sun, Jun 26, 2016 at 9:29 PM, David Turner wrote:
> On 06/26/2016 12:27 AM, Duy Nguyen wrote:
>>
>> On Sat, Jun 25, 2016 at 9:21 PM, David Turner wrote:
>>>
>>> On 06/25/2016 10:33 AM, Duy Nguyen wrote:
>>>>>
>>>>>
>>>>
On Mon, Jun 27, 2016 at 7:38 AM, wrote:
> ## Proposed solution
> Git LFS caches its objects under .git/lfs/objects. Most of the time Git
> LFS objects are already available in the cache (e.g. if you switch branches
> back and forth). I implemented these "cache hits" natively in Git.
> Please note
On Sun, Jun 26, 2016 at 7:54 PM, David Turner wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 385ea66..336d5a2 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1860,6 +1860,10 @@ indexhelper.autorun::
> Automatically run git i
On Mon, Jun 27, 2016 at 2:14 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Sun, 26 Jun 2016, Nguyễn Thái Ngọc Duy wrote:
>
>> This keeps #ifdef at the callee instead of caller, it's less messier.
>>
>> The caller in question is in read-cache.c which, unlike other
>> unix-socket callers so far, i
On Sun, Jun 26, 2016 at 8:27 PM, Jeff King wrote:
> On Sun, Jun 26, 2016 at 09:06:17AM +0200, Nguyễn Thái Ngọc Duy wrote:
>
>> If the path argument in "include" starts with "gitdir:", it is
>> followed by a wildmatch pattern. The include is only effective if
>> $GIT_DIR matches the pattern. This i
On Mon, Jun 27, 2016 at 6:20 PM, Jeff King wrote:
> You do allow distinguishing the suffix thing with "/" at the end in the
> rule above, though. So between the two rules:
>
> - slash at the end is a shorthand for "/**"
>
> - no-slash at the beginning (i.e., a non-absolute path) is a shorthand
On Mon, Jun 27, 2016 at 02:43:54PM -0400, Jeff King wrote:
> On Sun, Jun 26, 2016 at 07:58:05AM +0200, Nguyễn Thái Ngọc Duy wrote:
>
> > v4 is a cleaned up version of v3. Tests are added. Typos in
> > git-fetch.txt are corrected. The "{ -> origin/}master" format is
> > dropped.
>
> Thanks for con
On Mon, Jun 27, 2016 at 9:24 PM, Jeff King wrote:
> On Sun, Jun 26, 2016 at 07:16:16PM +0200, Nguyễn Thái Ngọc Duy wrote:
>
>> The difference with --relative option is, this option does not filter
>> paths outside cwd. You can add two more chars " ." on your command
>> line for that.
>
> Another d
On Mon, Jun 27, 2016 at 9:35 PM, Jeff King wrote:
> On Mon, Jun 27, 2016 at 09:33:18PM +0200, Duy Nguyen wrote:
>
>> On Mon, Jun 27, 2016 at 9:24 PM, Jeff King wrote:
>> > On Sun, Jun 26, 2016 at 07:16:16PM +0200, Nguyễn Thái Ngọc Duy wrote:
>> >
>> >>
On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Mon, 27 Jun 2016, Duy Nguyen wrote:
>
>> On Mon, Jun 27, 2016 at 7:38 AM, wrote:
>> > ## Proposed solution
>> > Git LFS caches its objects under .git/lfs/objects. Most of the t
On Tue, Jun 28, 2016 at 3:14 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Tue, 28 Jun 2016, Duy Nguyen wrote:
>
>> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
>> wrote:
>> >
>> > On Mon, 27 Jun 2016, Duy Nguyen wrote:
>>
On Tue, Jun 28, 2016 at 3:43 PM, Lars Schneider
wrote:
>
>> On 28 Jun 2016, at 15:14, Johannes Schindelin
>> wrote:
>>
>> Hi Duy,
>>
>> On Tue, 28 Jun 2016, Duy Nguyen wrote:
>>
>>> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
>&
Bringing this up again after I've seen another person accidentally
create a refs/heads/origin/some-branch and get really confused because
"git push" reports up-to-date but the remote branch is not updated. I
don't know how he got into that situation, but I hope we should be
able to catch it and sug
On Tue, Jun 28, 2016 at 10:49 PM, Jeff King wrote:
>> +static int prepare_include_condition_pattern(struct strbuf *pat)
>> +{
>> + struct strbuf path = STRBUF_INIT;
>> + int prefix = 0;
>> +
>> + /* TODO: maybe support ~user/ too */
>> + if (pat->buf[0] == '~' && is_dir_sep(pat->bu
On Tue, Jun 28, 2016 at 10:28 PM, Jeff King wrote:
> On Tue, Jun 28, 2016 at 07:26:39PM +0200, Nguyễn Thái Ngọc Duy wrote:
>
>> There's a surprise about core.ignorecase. We are matching paths, so we
>> should match case-insensitively if core.ignorecase tells us so. And it
>> gets a bit tricky if c
On Thu, Jun 30, 2016 at 3:06 PM, Johannes Schindelin
wrote:
> Even when NO_MMAP is empty, there might be no Unix sockets available (such
> as is the case on Windows). In any case, you really only want to skip
> these tests when index-helper is not available, so would you mind
> squashing this patc
Hi Jakub,
Where have you been all these years? :D
On Thu, Jun 30, 2016 at 11:42 AM, Jakub Narębski wrote:
> Nowadays we have gitcli(7) manual page, but perhaps
> it would be better to create a separate manpage for issues related
> to pathspec handling (of which ":/" is only one part)
On Mon, Jun 27, 2016 at 4:53 PM, Junio C Hamano wrote:
>> diff --git a/grep.c b/grep.c
>> index cb058a5..92587a8 100644
>> --- a/grep.c
>> +++ b/grep.c
>> @@ -432,15 +432,8 @@ static void compile_regexp(struct grep_pat *p, struct
>> grep_opt *opt)
>> icase = opt->regflags & REG_ICA
On Mon, Jun 27, 2016 at 8:43 PM, Jeff King wrote:
> I tried it on my most-horrible example case, and the results were...just
> OK. Because the variable-length part of each line comes first, the
> alignment code means that the "origin/$" bit of every line gets bumped
> out. And if you have a single
On Thu, Jun 30, 2016 at 6:39 PM, Nguyễn Thái Ngọc Duy wrote:
> Commit 76c61fb (log: decorate HEAD with branch name under
> --decorate=full, too - 2015-05-13)
.. and I got the commit wrong. It should be 51ff0f2 (log: decorate
HEAD with branch name - 2015-03-10)
adds "HEAD -> branch" decoration to
On Thu, Jun 30, 2016 at 7:55 PM, Ben Peart wrote:
> David Turner novalis.org> writes:
>
>>
>> Hiding watchman behind index-helper means you need both daemons. You
>> can't run watchman alone. Not so good. But on the other hand, 'git'
>> binary is not linked to watchman/json libraries, which is go
On Fri, Jul 1, 2016 at 4:20 PM, Michael J Gruber
wrote:
> Jeff King venit, vidit, dixit 01.07.2016 08:31:
>> On Thu, Jun 30, 2016 at 06:39:42PM +0200, Nguyễn Thái Ngọc Duy wrote:
>>
>>> Commit 76c61fb (log: decorate HEAD with branch name under
>>> --decorate=full, too - 2015-05-13) adds "HEAD -> b
On Fri, Jul 1, 2016 at 8:18 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> Makes sense. But then if opt->ignore_case is false and regflags
>> happens to have REG_ICASE set, should we clear it as well?
>
> I think .ignore_case is set iff '-i' is given,
On Sat, Jul 2, 2016 at 1:21 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> I'm not sure if we should bring back "{ -> origin/}foo" format. I can
>> do it if someone still wants it.
>> ...
>> +In compact output mode, specified with configuration variable
>> +fetch.output, if either
On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin
wrote:
> @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct
> merge_options *o,
>
> if (!sha_eq(a->sha1, b->sha1))
> result.clean = 0;
> - } else {
> -
On Sat, Jul 2, 2016 at 9:25 AM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Sat, 2 Jul 2016, Duy Nguyen wrote:
>
>> On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin
>> wrote:
>> > @@ -955,9 +955,8 @@ static struct merge_file_info merge_fil
On Sat, Jun 25, 2016 at 12:38:22AM +0200, Christoph Michelbach wrote:
> Hi,
>
> when run on a 32 bit system (Linux system, don't know about other
> systems),
>
> mkdir test && cd test && git init && touch someFile && git add someFile
> && git commit -m "Initial commit." && dd if=/dev/urandom
> of
On Sat, Jul 2, 2016 at 1:20 PM, Johannes Schindelin
wrote:
>> > -test -n "$NO_MMAP" && {
>> > - skip_all='skipping index-helper tests: no mmap'
>> > +git index-helper -h 2>/dev/null
>> > +test $? = 129 ||
>>
>> So when NO_MMAP is set, "git index-helper -h" will set $? to 1.
>
> Not quite.
>
On Sat, Jul 2, 2016 at 11:10 AM, Duy Nguyen wrote:
> On Sat, Jun 25, 2016 at 12:38:22AM +0200, Christoph Michelbach wrote:
>> Hi,
>>
>> when run on a 32 bit system (Linux system, don't know about other
>> systems),
>>
>> mkdir test && cd te
On Fri, Jul 1, 2016 at 1:54 AM, Ben Peart wrote:
> I've found (at least on Windows) that as the repo size gets larger, the
> time to read the index becomes a much smaller percentage of the overall
> time. I just captured some perf traces of git status on a large repo we
> have. Of that, 92.5% wa
On Mon, Jul 4, 2016 at 3:17 PM, Marc Branchaud wrote:
> On 2016-07-01 12:03 PM, Nguyễn Thái Ngọc Duy wrote:
>>
>> v5 changes the substitute symbol from '$' to '*' in compact mode and
>> makes sure long lines in compact mode will not make the remote ref
>> column too big (it's far from perfect but
On Mon, Jul 4, 2016 at 4:07 PM, Jakub Narębski wrote:
> W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze:
>> +summary::
>> + For a successfully fetched ref, the summary shows the old and new
>> + values of the ref in a form suitable for using as an argument to
>> + `git log` (this
On Mon, Jul 04, 2016 at 04:50:38PM +0300, Yuri Kanivetsky wrote:
> Hi,
>
> When intent to add a directory is made (`git add -N`), and then
> contents of any but the first file is staged, `git commit -v --amend`
> doesn't add it to the commit
Oops, a bug since 2012. Thanks for the report. I know w
On Mon, Jul 4, 2016 at 5:25 PM, Jakub Narębski wrote:
> W dniu 2016-07-04 o 17:17, Duy Nguyen pisze:
>> On Mon, Jul 4, 2016 at 4:07 PM, Jakub Narębski wrote:
>>> W dniu 2016-06-26 o 07:58, Nguyễn Thái Ngọc Duy pisze:
>>>> +summary::
>>>> + For a s
On Tue, Jul 5, 2016 at 5:07 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> ever since I started working extensively with worktrees, I end up with
> these funny gc problems, like broken links and stale reflogs.
Yeah we have problem with gc not traversing all worktree refs. I had
something that could
On Tue, Jul 5, 2016 at 10:25 PM, Johannes Sixt wrote:
> Am 05.07.2016 um 19:05 schrieb Nguyễn Thái Ngọc Duy:
>>
>> + die(Q_("premature end of pack file, %"PRIuMAX"
>> byte missing",
>> + "premature end of pack file, %"PRIuMAX"
>> bytes missing",
>
On Tue, Jul 5, 2016 at 1:23 PM, Johannes Schindelin
wrote:
> The vast majority of error messages in Git's source code which report a
> bug use the convention to prefix the message with "BUG:".
>
> As part of cleaning up merge-recursive to stop die()ing except in case of
> detected bugs, let's just
On Wed, Jul 6, 2016 at 10:20 AM, Johannes Schindelin
wrote:
> BTW I am in the middle of trying to abstract out a "simple server" that
> will allow me to back the inter-process communication by a pure Windows
> solution (named pipes) instead of the Unix sockets. It turns out to be
> much more diffi
ffde784.pack) is corrupt
> error: failed to run prune
> frank@frank-virtual-16-04-32-bit:~/g$
>
> on the virtual machine.
>
> Not including the mailing list in CC wasn't intended.
>
> --
> With kind regards
> Christoph Michelbach
>
> On Wed, 2016-07-06 at 17:2
On Wed, Jul 06, 2016 at 12:26:19PM -0700, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
> > @@ -426,6 +433,15 @@ int cache_tree_update(struct index_state *istate, int
> > flags)
> > i = update_one(it, cache, entries, "", 0, &skip, flags);
> > if (i < 0)
> > return i
On Thu, Jul 07, 2016 at 11:52:58AM -0700, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > I'll deal with that separately. Let's focus on cache-tree only this
> > time. So how about this on top?
>
> I was hoping that you would limit the scope of the test to ch
101 - 200 of 4016 matches
Mail list logo
