On Wed, Dec 14, 2016 at 10:10:10AM -0500, Jeff King wrote:
> diff --git a/parse-options.c b/parse-options.c
> index 312a85dbd..4fbe924a5 100644
> --- a/parse-options.c
> +++ b/parse-options.c
> @@ -661,7 +661,7 @@ void NORETURN usage_msg_opt(const char *msg,
> const char * const *u
On Mon, Dec 19, 2016 at 8:41 PM, Jeff King wrote:
> On Mon, Dec 19, 2016 at 07:07:19PM +0700, Duy Nguyen wrote:
>
>> On Wed, Dec 14, 2016 at 10:10:10AM -0500, Jeff King wrote:
>> > diff --git a/parse-options.c b/parse-options.c
>> > index 312a85dbd..4fbe924a5 100
On Mon, Dec 19, 2016 at 9:05 PM, Jeff King wrote:
> On Mon, Dec 19, 2016 at 08:53:30PM +0700, Duy Nguyen wrote:
>
>> >> Your commit message does not make clear if you want this "fatal" to be
>> >> grep-able (by scripts) or not. If not, please _() the stri
On Tue, Dec 20, 2016 at 1:15 AM, Stefan Beller wrote:
> On Sun, Dec 18, 2016 at 9:35 PM, Duy Nguyen wrote:
>> On Mon, Dec 12, 2016 at 11:04:35AM -0800, Stefan Beller wrote:
>>> diff --git a/dir.c b/dir.c
>>> index e0efd3c2c3..d872cc1570 100644
>>> --- a/
On Mon, Dec 19, 2016 at 10:14:27AM -0800, Junio C Hamano wrote:
> Shouldn't the error-return path in the second hunk rollback the
> lockfile to clean after itself? The existing "Oh, we cannot chmod
> to match the original" check that comes immediately after shares the
> same issue, so this is not
On Wed, Dec 21, 2016 at 12:26 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> diff --git a/graph.c b/graph.c
>> index d4e8519..75375a1 100644
>> --- a/graph.c
>> +++ b/graph.c
>> @@ -78,6 +78,7 @@ static void graph_show_line_prefix(const struct
>> diff_options *diffopt)
>>
>> sta
On Tue, Dec 20, 2016 at 11:57 PM, Jeff King wrote:
> On Tue, Dec 20, 2016 at 07:39:29PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> I got mad after tracing two consecutive red history lines in `git log
>> --graph --oneline` back to their merge points, f
On Fri, Dec 23, 2016 at 5:18 AM, Junio C Hamano wrote:
> Will merge to 'next'.
> - nd/config-misc-fixes 12-22
> #3
Hold it. You made a comment about rollback lockfile on uninitialized
variable or something but I haven't time to really look at it
On Sat, Dec 24, 2016 at 12:46 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Fri, Dec 23, 2016 at 5:18 AM, Junio C Hamano wrote:
>>> Will merge to 'next'.
>>> - nd/config-misc-fixes 12-22
>>&
On Fri, Dec 23, 2016 at 5:13 AM, Stefan Beller wrote:
> *Ideally* I would rather have a different formatting, e.g. maybe:
>
> $ git checkout remotes/origin/js/sequencer-wo-die
> $ git rebase -i --new-magic v2.10.0-rc2^
>
> which produces:
>
> pick d5cb9cbd64 Git 2.10-rc2
On Fri, Dec 23, 2016 at 2:06 AM, Junio C Hamano wrote:
> If I were doing this, I'd just prepare a table with 32 color slots
> or so [*1*], start at a random spot (say 017:5f) of
>
> https://en.wikipedia.org/wiki/File:Xterm_256color_chart.svg,
>
> and pick spots by jumping southeast like a
On Thu, Dec 29, 2016 at 1:18 AM, Brandon Williams wrote:
> On 12/27, Junio C Hamano wrote:
>> * bw/pathspec-cleanup (2016-12-14) 16 commits
>> - pathspec: rename prefix_pathspec to init_pathspec_item
>> - pathspec: small readability changes
>> - pathspec: create strip submodule slash helpers
>>
On Wed, Dec 14, 2016 at 6:14 AM, Brandon Williams wrote:
> @@ -2010,14 +1987,11 @@ static struct untracked_cache_dir
> *validate_untracked_cache(struct dir_struct *d
> return root;
> }
>
> -int read_directory(struct dir_struct *dir, const char *path, int len, const
> struct pathspec *pa
On Wed, Dec 14, 2016 at 6:14 AM, Brandon Williams wrote:
> void clear_pathspec(struct pathspec *pathspec)
> {
> + int i;
> +
> + for (i = 0; i < pathspec->nr; i++) {
> + free(pathspec->items[i].match);
> + free(pathspec->items[i].original);
> + }
>
On Wed, Dec 14, 2016 at 6:14 AM, Brandon Williams wrote:
> @@ -340,8 +336,9 @@ static void NORETURN unsupported_magic(const char
> *pattern,
> continue;
> if (sb.len)
> strbuf_addch(&sb, ' ');
> - if (short_magic & m->b
On Thu, Dec 29, 2016 at 5:06 PM, Duy Nguyen wrote:
> On Thu, Dec 29, 2016 at 1:18 AM, Brandon Williams wrote:
>> On 12/27, Junio C Hamano wrote:
>>> * bw/pathspec-cleanup (2016-12-14) 16 commits
>>> - pathspec: rename prefix_pathspec to init_pathspec_item
>>
On Mon, Jan 2, 2017 at 6:14 PM, Michael J Gruber
wrote:
> Currently, the headers "error: ", "warning: " etc. - generated by die(),
> warning() etc. - are not localized, but we feed many localized error messages
> into these functions so that we produce error messages with mixed
> localisation.
>
On Wed, Jan 4, 2017 at 2:45 AM, Stefan Beller wrote:
>> In this implementation, the gettext call for the header and the body are done
>> in different places (error function vs. caller) but this call pattern seems
>> to
>> be the easiest variant for the caller, because the message body has to be
On Tue, Dec 20, 2016 at 6:19 AM, Stefan Beller wrote:
>> On 12/19, Stefan Beller wrote:
> This code is heavily inspired by refs/files-backend.c which upon
> closer inspection only retries directory things within the git directory
> (which is assumed to be accessed in parallel by different invocati
On Wed, Jan 4, 2017 at 1:42 AM, Brandon Williams wrote:
> diff --git a/dir.c b/dir.c
> index 15f7c9993..e8ddd7f8a 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1353,6 +1353,15 @@ static int simplify_away(const char *path, int pathlen,
> {
> int i;
>
> + if (pathspec)
> + gu
On Thu, Jan 5, 2017 at 9:02 PM, Stefan Beller wrote:
> On Thu, Jan 5, 2017 at 2:06 AM, Roland Illig wrote:
>> Git 2.11.0 gives a wrong error message after the following commands:
>>
>> $ git init
>> $ echo hello >file
>> $ git add file
>> $ git commit -m "message"
>> $ git worktree add ../worktre
On Sat, Jan 7, 2017 at 8:22 AM, Jeff King wrote:
> When you hit ^C to interrupt a git command going to a pager,
> this usually leaves the pager running. But when a dashed
> external is in use, the pager ends up in a funny state and
> quits (but only after eating one more character from the
> termi
On Thu, Jan 5, 2017 at 1:03 AM, Brandon Williams wrote:
> Changes in v5:
> * Move GUARD_PATHSPEC to prevent checking if pathspec is null twice.
> * Mark a string containing 'mnemonic' for translation.
Argh.. I've run out of things to complain about! Ack!
--
Duy
On Wed, Jan 4, 2017 at 8:25 PM, Duy Nguyen wrote:
> On Wed, Jan 4, 2017 at 2:45 AM, Stefan Beller wrote:
>>> In this implementation, the gettext call for the header and the body are
>>> done
>>> in different places (error function vs. caller) but this call pa
On Mon, Jan 9, 2017 at 12:34 PM, Jeff King wrote:
>> +test_expect_success 'log --graph with merge with log.graphColors' '
>> + test_config log.graphColors " blue , cyan , red " &&
>
> This funny syntax isn't required, right? It should work with the more
> natural:
>
> test_config log.graph
On Mon, Jan 9, 2017 at 10:44 AM, Jacob Keller wrote:
> Why not just update the documentation to be "when you are done with a
> work tree you can delete it and then run git worktree prune"?
The document does say that (a bit verbose though):
When you are done with a linked working tree you can sim
On Mon, Jan 9, 2017 at 12:30 PM, Jeff King wrote:
> I also wonder if it is worth just using argv_array. We do not care about
> NULL-terminating the list here, but it actually works pretty well as a
> generic string-array class (and keeping a NULL at the end of any
> array-of-pointers is a reasonab
On Sun, Jan 8, 2017 at 4:46 AM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> So what should we do if freshen_file() returns 0 which means that the
>> freshening failed?
>
> You tell me ;-) as you are the one who is proposing this feature.
My answer is, we are not worse than freshening
On Sun, Jan 8, 2017 at 4:38 AM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> It feels strange that when I do things one way, you suggest another
>> way, and the next time in a similar situation when I do things the way
>> you suggested previously, then you suggest the way I did it initia
On Thu, Jan 5, 2017 at 6:23 PM, Quentin Casasnovas
wrote:
> Hi guys,
>
> Apologies if this is documented somewhere, I have fairly bad search vudu
> skills.
>
> I'm looking for a way to cause a full refresh of the index without causing
> any read of the files, basically telling git "trust me, all w
On Tue, Jan 10, 2017 at 12:08 PM, Jacob Keller wrote:
> On Mon, Jan 9, 2017 at 2:07 AM, Duy Nguyen wrote:
>> On Mon, Jan 9, 2017 at 10:44 AM, Jacob Keller wrote:
>>> Why not just update the documentation to be "when you are done with a
>>> work tree you can del
On Tue, Jan 10, 2017 at 6:25 PM, Nguyễn Thái Ngọc Duy wrote:
> Not much has changed from v4, except that the migration to new config
> layout is done automatically _update_ a config variable with "git
> config --worktree".
I accidentally two words that may make it hard to understand this
sentence
Just FYI. The broken internet cables in Vietnam seem to hit my ISP
really hard. It's nearly impossible to make a TCP connection. So I'm
basically off the grid, hopefully not longer than two weeks.
On 1/10/17, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> +end = string + strlen(s
I've started working on fixing the "git gc" issue with multiple
worktrees, which brings me back to this. Just some thoughts. Comments
are really appreciated.
In the current code, files backend has special cases for both
submodules (explicitly) and linked worktrees (hidden behind git_path).
But if
Thanks. I'll shelve this for now, maybe sleep on it for a while. The
series is complete without this patch by the way, if you want to pick
it up.
On Fri, Jan 13, 2017 at 6:08 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> With per-worktree configuration in place, core.bare is mov
On Wed, Jan 11, 2017 at 12:01 AM, Stefan Beller wrote:
> On Tue, Jan 10, 2017 at 3:25 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> Let's get this rolling again. To refresh your memory because it's half
>> a year since v4 [1], this is about letting each worktree in multi
>> worktree setup has their own c
On Mon, Jan 9, 2017 at 9:34 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sun, Jan 8, 2017 at 4:46 AM, Junio C Hamano wrote:
>>> Christian Couder writes:
>>>
>>>> So what should we do if freshen_file() returns 0 which means that the
>>&
On Fri, Jan 20, 2017 at 2:00 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Mon, Jan 9, 2017 at 9:34 PM, Junio C Hamano wrote:
>>> Duy Nguyen writes:
>>>
>>>> On Sun, Jan 8, 2017 at 4:46 AM, Junio C Hamano wrote:
>>>>> Chris
On Fri, Jan 20, 2017 at 12:23 AM, Jeff King wrote:
> I think it's a neat idea, but the actual option:
>
>> +--decorate-remote-reflog[=]::
>> + Decorate `` most recent reflog entries on remote refs, up
>> + to the specified number of entries. By default, only the most
>> + recent reflog
On Fri, Jan 20, 2017 at 5:46 PM, Johannes Schindelin
wrote:
> Why not introduce a flag to "git log" that shows a keyboard-friendly name
> similar to what `git name-rev` would have said, except that the name would
> be generated using the name(s) specified on the command-line?
>
> Example:
>
>
On Thu, Jan 19, 2017 at 8:30 PM, Michael Haggerty wrote:
> I kindof think that it would have been a better design to store the
> references for all linked worktrees in the main repository's ref-store.
> For example, the "bisect" refs for a worktree named "" could have
> been stored under "refs/wor
On Thu, Jan 12, 2017 at 1:08 AM, Junio C Hamano wrote:
> Jeff King writes:
>
>> Yes, I would think die_errno() is a no-brainer for translation, since
>> the strerror() will be translated.
>>
>>> apply.c:die(_("internal error"));
>>>
>>> That is funny, too. I think we should su
On Wed, Jan 11, 2017 at 06:37:25AM -0500, Jeff King wrote:
> > To find a good example, "git grep die" giving me some food of though:
> >
> > die_errno(..) should always take a string marked up for translation,
> > because the errno string is translated?
>
> Yes, I would think die_errno() is a no-
On Fri, Jan 20, 2017 at 8:23 PM, Duy Nguyen wrote:
> I've tested it a bit. Seems to work ok.
Oops. Didn't notice that the "fatal:" bit is still untranslated but
Micheal's patch can handle that.
--
Duy
On Sat, Jan 21, 2017 at 2:25 AM, Jeff King wrote:
> On Fri, Jan 20, 2017 at 11:16:15AM -0800, Jacob Keller wrote:
>
>> > I recently taught urxvt to recognize sha1s and grab them via keyboard
>> > hints, and I'm finding it quite useful. Here's what it looks like if
>> > you're interested:
>> >
>> >
On Sat, Jan 21, 2017 at 5:00 AM, Jacob Keller wrote:
> On Fri, Jan 20, 2017 at 6:30 AM, Jeff King wrote:
>>> Imposing order between options could cause confusion, I think, if you
>>> remove --decorate-reflog leaving --remotes on by accident, now you get
>>> --remotes with a new meaning. We could
On Sat, Jan 21, 2017 at 2:17 AM, Jeff King wrote:
> On Thu, Jan 19, 2017 at 11:30:23AM -0800, Stefan Beller wrote:
>
>> Now let's ask the same question for "git -C sub status ." (which is a
>> command that is only reading and not writing to the repository)
>>
>> 1) If the submodule is populated, t
On Thu, Jan 26, 2017 at 4:11 AM, Junio C Hamano wrote:
> * I am expecting that the new one yet to be introduced will not
>share the huge "switch (selector)" part, but does its own things
>in a separate function with a similar structure. The only thing
>common between these two functi
On Thu, Jan 26, 2017 at 3:50 AM, Jeff King wrote:
> On Wed, Jan 25, 2017 at 07:50:51PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> These options have on thing in common: when specified right after
>> --exclude, they will de-select refs instead of selecting them by
>> default.
>>
>> This change makes i
On Thu, Jan 26, 2017 at 3:57 AM, Jeff King wrote:
> I don't think it means either. It means to include remotes in the
> selected revisions, but excluding the entries mentioned by --exclude.
>
> IOW:
>
> --exclude=foo --remotes
> include all remotes except refs/remotes/foo
>
> --exclude
On Wed, Feb 01, 2017 at 01:21:29AM +0100, Jeff King wrote:
> On Tue, Jan 31, 2017 at 02:45:40PM -0800, Junio C Hamano wrote:
>
> > * nd/log-graph-configurable-colors (2017-01-23) 3 commits
> > (merged to 'next' on 2017-01-23 at c369982ad8)
> > + log --graph: customize the graph lines with confi
On Tue, Jan 31, 2017 at 12:27 AM, Jeff King wrote:
> On Sat, Jan 28, 2017 at 05:29:32PM -0700, Bob Proulx wrote:
>
>> However the problem driving me crazy is that this only fails this way
>> on one machine. Unfortunately failing on the machine I need to use.
>> If I try this same setup on any oth
On Thu, Feb 2, 2017 at 4:16 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Thu, 2 Feb 2017, Nguyễn Thái Ngọc Duy wrote:
>
>> This squashes two changes from Johannes and Ramsay: [...]
>
> Sorry, I lost track of the worktree discussions... Could you remind me
> which patch is supposed to fix my con
On Thu, Feb 2, 2017 at 10:55 AM, Kyle Meyer wrote:
> Hello,
>
> As of 6311cfaf9 (init: do not set unnecessary core.worktree,
> 2016-09-25), "git init --separate-git-dir" no longer sets core.worktree
> (test below). Based on the commit message and the corresponding thread
> [1], I don't think this
On Thu, Feb 2, 2017 at 4:43 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Thu, 2 Feb 2017, Duy Nguyen wrote:
>
>> On Thu, Feb 2, 2017 at 4:16 PM, Johannes Schindelin
>> wrote:
>> > Hi Duy,
>> >
>> > On Thu, 2 Feb 2017, Nguyễn Thái Ngọc D
On Thu, Feb 2, 2017 at 5:37 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Thu, 2 Feb 2017, Duy Nguyen wrote:
>
>> On Thu, Feb 2, 2017 at 4:43 PM, Johannes Schindelin
>> wrote:
>> >
>> > On Thu, 2 Feb 2017, Duy Nguyen wrote:
>> >
>&g
On Fri, Feb 3, 2017 at 12:51 AM, Hilco Wijbenga
wrote:
> Hi all,
>
> I'm trying to get the committer date printed in a custom fashion.
> Using "%cI" gets me close:
>
> $ git show --format="%cI | %an" master | head -n 1
> 2017-01-31T17:02:13-08:00 | Hilco Wijbenga
>
> I would like to get rid of the
On Fri, Feb 3, 2017 at 3:21 AM, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>> Also, the more important reply was Peff's reply that suggested that the
>> proposed fix was incomplete, as it misses --unpack-unreachable:
>> https://public-inbox.org/git/20160601160143.ga9...@sigill.intra.pe
On Fri, Feb 3, 2017 at 7:30 AM, Jacob Keller wrote:
> From: Jacob Keller
>
> It is sometimes useful to break a commit into parts to more logically
> show how the code changes. There are many possible ways to achieve this
> result, but one simple and powerful one is to use git reset -p.
>
> Add an
On Thu, Feb 02, 2017 at 01:42:44PM +0100, Jeff King wrote:
> On Thu, Feb 02, 2017 at 04:16:15PM +0700, Duy Nguyen wrote:
>
> > > I hadn't heard anything back,
> >
> > Sorry I was accidentally busy during Luna new year holiday.
>
> No problem. That so
On Thu, Feb 2, 2017 at 7:37 PM, Kyle Meyer wrote:
> Duy Nguyen writes:
>
>> On Thu, Feb 2, 2017 at 10:55 AM, Kyle Meyer wrote:
>>>
>>> As of 6311cfaf9 (init: do not set unnecessary core.worktree,
>>> 2016-09-25), "git init --separate-git-dir&q
On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller wrote:
> +
> +$ git reset HEAD^ <1>
It may be a good idea to add -N here, so that 'add -p' can pick up the
new files if they are added in HEAD.
> +$ git add -p<2>
--
Duy
On Sat, Feb 4, 2017 at 12:10 AM, Hilco Wijbenga
wrote:
>>> How do I get "2017-01-31T17:02:13 | Hilco Wijbenga" to be output?
>>
>> You'll get an ellipsis at the end though.. (i.e. 02:13... | Hilco)
>
> Indeed, that's not very nice. I suppose I can understand the reason
> for it but it mostly defea
On Sat, Feb 4, 2017 at 1:25 AM, Junio C Hamano wrote:
> Even if you think "the right way" is to add to the iterators, I
> suspect that we can still do incremental fixes? I agree with the
> order of importance Michael listed in his message (i.e. the index
> and the HEAD first, and then other per-w
On Sat, Feb 4, 2017 at 7:16 PM, Philip Oakley wrote:
> From: "Duy Nguyen"
>>
>> On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller
>> wrote:
>>>
>>> +
>>> +$ git reset HEAD^ <1>
>>
>&g
On Wed, Feb 1, 2017 at 12:12 AM, Herbert, Marc wrote:
> (Thanks to Josh Triplett[*] for contributing to this message)
>
> Hi,
>
> We often work with development/integration branches that regularly
> rebase, in addition to stable branches that do not. Git is used to share
> two different types of b
On Sat, Jan 21, 2017 at 2:16 AM, Jacob Keller wrote:
> I would be interested in the code for this.. I'm curious if I can
> adapt it to my use of tmux.
I stumbled upon this which does mention about git SHA-1. Maybe you'll
find it useful. Haven't tried it out though.
https://github.com/morantron/t
On Mon, Feb 6, 2017 at 1:15 PM, Samuel Lijin wrote:
> # Irrelevant but someone should take a look
>
> 693
To save people some time (and since i looked at it anyway), this is
about whether "warning in tree xxx: contains zero-padded file modes:
from fsck should be a warning or error. It is a warnin
On Tue, Feb 7, 2017 at 7:56 AM, Bob Proulx wrote:
> Bob Proulx wrote:
>> 17:20:40.590177 pkt-line.c:46 packet:clone<
>> 34e7202270c381f4e5734180dc19426ce69f2e1e HEAD\0multi_ack thin-pack side-band
>> side-band-64k ofs-delta shallow no-progress include-tag multi_ack_detailed
On Tue, Feb 7, 2017 at 1:59 AM, Junio C Hamano wrote:
> Patrick Steinhardt writes:
>
>> struct option options[] = {
>> OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
>> - OPT__VERBOSE(&verbose, N_("report pruned objects")),
>> + OPT__VERBOSE(
On Thu, Jan 19, 2017 at 6:55 PM, Duy Nguyen wrote:
> I've started working on fixing the "git gc" issue with multiple
> worktrees, which brings me back to this. Just some thoughts. Comments
> are really appreciated.
>
> In the current code, files backend has speci
On Wed, Feb 8, 2017 at 5:04 AM, René Scharfe wrote:
> Pass the match member of the first pathspec item directly to
> read_directory() instead of using common_prefix() to duplicate it first,
> thus avoiding memory duplication, strlen(3) and free(3).
How about killing common_prefix()? There are two
On Wed, Feb 8, 2017 at 2:18 AM, Jacob Keller wrote:
> Personally, I think that the fact that Git forces the user to think
> about it in terms of "oh I have to fetch" instead of that happening
> automatically, it helps teach the model to the user. If it happened in
> the background then the user mi
On Wed, Feb 8, 2017 at 6:11 AM, Davide Del Vento wrote:
> `git log --graph --name-only` works fine, but the name is not
> properly indented as it is for `git log --graph --name-status`
>
> I tested this in git v1.9.1 the only one I have access at the moment
Confirmed still happens on master. --
On Wed, Feb 8, 2017 at 12:12 PM, Linus Torvalds
wrote:
> Two-patch series to follow.
glossary-content.txt update for both patches would be nice.
--
Duy
On Wed, Feb 8, 2017 at 8:03 AM, David Turner wrote:
> On Sat, 2016-12-17 at 14:50 +0700, Duy Nguyen wrote:
>> And we can't grep for fatal errors anyway. The problem that led to
>> 329e6e8794 was this line
>>
>> warning: There are too many unreachable loos
On Wed, Feb 8, 2017 at 3:24 PM, David Turner wrote:
> On Wed, 2017-02-08 at 13:45 +0700, Duy Nguyen wrote:
>> On Wed, Feb 8, 2017 at 8:03 AM, David Turner wrote:
>> > On Sat, 2016-12-17 at 14:50 +0700, Duy Nguyen wrote:
>> >> And we can't grep for fatal err
On Wed, Feb 8, 2017 at 7:17 PM, Johannes Schindelin
wrote:
> ... and a half-working workaround for the auto-gc case.
>
> This patch series really is just another attempt to prod Duy into fixing
> this instead of dabbling with shiny new toys ;-)
FYI work is ongoing [1] [2]. If you want it even fas
On Wed, Feb 8, 2017 at 7:17 PM, Johannes Schindelin
wrote:
> In addition to making git_path() aware of certain file names that need
> to be handled differently e.g. when running in worktrees, the commit
> 557bd833bb (git_path(): be aware of file relocation in $GIT_DIR,
> 2014-11-30) also snuck in
On Thu, Feb 9, 2017 at 2:05 AM, Thangalin wrote:
> I frequently forget to add .gitignore files when creating new .gitignore
> files.
>
> I'd like to request a command-line option to always add .gitignore
> files (or, more generally, always add files that match a given file
> specification).
>
> R
On Thu, Feb 9, 2017 at 1:07 PM, Michael Haggerty wrote:
> It is unquestionably a good goal to avoid parsing references outside of
> `refs/files-backend.c`. But I'm not a fan of this approach.
Yes. But in this context it was more of a guinea pig. I wanted
something simple enough to code up show we
On Thu, Feb 9, 2017 at 12:39 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Wed, Feb 8, 2017 at 12:12 PM, Linus Torvalds
>> wrote:
>>> Two-patch series to follow.
>>
>> glossary-content.txt update for both patches would be nice.
>
> I am
On Thu, Feb 9, 2017 at 4:11 AM, Junio C Hamano wrote:
> With or without the patch in this thread, parse_pathspec() behaves
> the same way for either CWD or FULL if you feed a non-empty
> pathspec with at least one positive element. IOW, if a caller feeds
> a non-empty pathspec and there is no "ne
On Thu, Feb 09, 2017 at 07:40:33PM -0500, Jeff King wrote:
> On Thu, Feb 09, 2017 at 10:23:35PM +0100, Michael Haggerty wrote:
>
> > >> So push the submodule attribute down to the `files_ref_store` class
> > >> (but continue to let the `ref_store`s be looked up by submodule).
> > >
> > > I'm not
On Tue, Feb 14, 2017 at 3:14 AM, Ramsay Jones
wrote:
>
>
> On 13/02/17 15:20, Nguyễn Thái Ngọc Duy wrote:
>> Created in 5f3c3a4e6f (files_log_ref_write: new function - 2015-11-10)
>> but probably never used outside refs-internal.c
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> refs/files-ba
On Tue, Feb 14, 2017 at 6:35 AM, Stefan Beller wrote:
>> + git_dir = read_gitfile(buf.buf);
>
> if buf.buf is a (git) directory as opposed to a git file,
> we error out in read_gitfile. Did you mean to use
> read_gitfile_gently here or rather even resolve_gitdir_gently ?
This is what strbuf
On Tue, Feb 14, 2017 at 6:09 AM, Stefan Beller wrote:
>> +
>> + if (submodule) {
>> + refs->submodule = xstrdup_or_null(submodule);
>
> drop the _or_null here?
>
> So in this patch we have either
> * submodule set
> * or gitdir/gitcommondir set
>
> which means that we exercise
On Tue, Feb 14, 2017 at 5:37 AM, Stefan Beller wrote:
> On Mon, Feb 13, 2017 at 7:20 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> All refs outside refs/ directory is per-worktree, not just HEAD.
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> refs/refs-internal.h | 2 +-
>> 1 file changed, 1 inser
On Tue, Feb 14, 2017 at 3:58 AM, Ramsay Jones
wrote:
>> -void files_path(struct files_ref_store *refs, struct strbuf *sb,
>> - const char *fmt, ...) __attribute__((format (printf, 3, 4)));
>
> You only added this in the last commit, so maybe mark it static in
> the previous patch! Also
On Tue, Feb 14, 2017 at 6:55 AM, Stefan Beller wrote:
>>
>> +/*
>> + * Return the ref_store instance for the specified submodule. For the
>> + * main repository, use submodule==NULL; such a call cannot fail.
>
> So now we have both a get_main as well as a get_submodule function,
> but the submodul
On Wed, Feb 15, 2017 at 1:24 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> Direct call sites are just middle men though, e.g.
>> for_each_ref_submodule(). I'll attempt to clean this up at some point
>> in future (probably at the same time I attempt to kill *
On Wed, Feb 15, 2017 at 1:13 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> All these warning() calls are preceded by a system call. Report the
>> actual error to help the user understand why we fail to remove
>> something.
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> v2
On Tue, Feb 14, 2017 at 6:01 AM, Vanderhoof, Tzadik
wrote:
> The output of git-diff includes lines beginning with "+" and "-" to indicate
> added and deleted lines. A somewhat common task (at least for me) is to want
> to copy output from a "diff" (usually the deleted lines) and paste it back
On Sat, Feb 18, 2017 at 1:35 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> I'll be sending two more follow-up series, if you are interested, soon:
>>
>> 1) v2 of nd/worktree-gc-protection
>>
>> which kills parse_ref() in worktree.c _and_ set_worktree_head_symref()
>> in files-bac
On Mon, Feb 20, 2017 at 7:11 PM, Michael Haggerty wrote:
> On 02/18/2017 02:33 PM, Nguyễn Thái Ngọc Duy wrote:
>> Since submodule or not is irrelevant to files-backend after the last
>> patch, remove the parameter from files_downcast() and kill
>> files_assert_main_repository().
>>
>> PS. This imp
On Mon, Feb 20, 2017 at 6:23 PM, Michael Haggerty wrote:
> On 02/16/2017 12:48 PM, Nguyễn Thái Ngọc Duy wrote:
>> This centralizes all path rewriting of files-backend.c in one place so
>> we have easier time removing the path rewriting later. There could be
>> some hidden indirect git_path() thoug
On Mon, Feb 20, 2017 at 6:34 PM, Michael Haggerty wrote:
> On 02/18/2017 02:32 PM, Nguyễn Thái Ngọc Duy wrote:
>> Given $GIT_DIR and $GIT_COMMON_DIR, files-backend is now in charge of
>> deciding what goes where. The end goal is to pass $GIT_DIR only. A
>> refs "view" of a linked worktree is a log
On Mon, Feb 20, 2017 at 7:30 PM, Michael Haggerty wrote:
> On 02/20/2017 01:21 PM, Duy Nguyen wrote:
>> On Mon, Feb 20, 2017 at 7:11 PM, Michael Haggerty
>> wrote:
>>> On 02/18/2017 02:33 PM, Nguyễn Thái Ngọc Duy wrote:
>>>> Since submodule or not is irrele
On Mon, Feb 20, 2017 at 7:42 PM, Michael Haggerty wrote:
> On 02/18/2017 02:32 PM, Nguyễn Thái Ngọc Duy wrote:
>> v4:
>
> I very much like the direction of this patch series. I reviewed the
> design pretty carefully and left some comments about it, and skimmed
> through the code changes. But I hav
On Mon, Feb 20, 2017 at 7:11 PM, Michael Haggerty wrote:
> On 02/18/2017 02:33 PM, Nguyễn Thái Ngọc Duy wrote:
>> Since submodule or not is irrelevant to files-backend after the last
>> patch, remove the parameter from files_downcast() and kill
>> files_assert_main_repository().
>>
>> PS. This imp
301 - 400 of 4016 matches
Mail list logo
