Hi Junio,
On Thu, 10 Mar 2016, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> >> Granted, "git worktree remove" should be the work horse. But why not have
> >> two ways to skin the same cat? I, again, would prefer the short 'n sweet
> >> "git branch -d -w pull-rebase-prefix" invocation.
> >
> >
On 15/03/2016 10:59, 惠轶群 wrote:
Well, In my opinion:
1. $XDG_CACHE_HOME is more meaningful than $XDG_CONFIG_HOME,
while $XDG_RUNTIME_DIR is more meaningful than $XDG_CACHE_HOME.
However, I feel that I should value suggestions of who have more
experience
about this project than me.
2. $XDG_CAC
>I created a test case but git diff exits with 0 if it does not recognize the
file >path so the test case always succeeds. Can you give me a hint or one
>example test case?
The most clean (?) is to compare "git diff" NFC and git diff NFD, they should
give the same result:
for "git diff" somet
On 03/15/2016 02:59 AM, Eric Wong wrote:
[]
I just edited locally and pushed those out to Junio:
http://mid.gmane.org/20160315015726.ga25...@dcvr.yhbt.net
The new TC 11/12 don't pass under cygwin.
Do we need cp932 ?
If not, we may use the paych from here:
https://github.com/tboegi/git/commi
On Tue, Mar 15, 2016 at 09:32:21AM +0800, 惠轶群 wrote:
> > You sound like you think it is better to check the location of the
> > existing socket,
>
> Yes, for the purpose of compatibility, it's the only choice, as I can see.
I'm not sure the existing socket location matters, in the way that it
do
On 15/03/2016 09:32, 惠轶群 wrote:
You sound like you think it is better to check the location of the
existing socket,
Yes, for the purpose of compatibility, it's the only choice, as I can
see.
To sum up, I'd like to implement:
1. is configured by --socket, then put it here.
2. else if `~/.gi
Torsten Bögershausen wrote:
> On 28.02.16 05:59, Eric Wong wrote:
> > tbo...@web.de wrote:
> > Please keep lines wrapped at 80 cols or less.
> > (I need big fonts)
> OK
> >
> >> @@ -105,10 +105,10 @@ test_expect_success UTF8 'svn.pathnameencoding=cp932
> >> new file on dcommit' '
> >> '
> > Why
Junio C Hamano wrote:
> If there are pending updates for the upcoming release, please let me
> know and tell me what to pull.
>
> Thanks.
The following changes since commit db6696f653b917509dac1ac13b922e12773a84ff:
Merge branch 'mg/wt-status-mismarked-i18n' (2016-03-14 10:46:17 -0700)
are av
> You sound like you think it is better to check the location of the
> existing socket,
Yes, for the purpose of compatibility, it's the only choice, as I can see.
To sum up, I'd like to implement:
1. is configured by --socket, then put it here.
2. else if `~/.git-credential-cache` exists, put t
Later on we want to automatically call `git submodule init` from
other commands, such that the users don't have to initialize the
submodule themselves. As these other commands are written in C
already, we'd need the init functionality in C, too. The
`resolve_relative_url` function is a large part
This applies on top of origin/sb/submodule-parallel-update.
By having the `init` functionality in C, we can reference it easier
from other parts in the code.
Thanks for the reviews a long time ago!
Junio,
I fixed the NEEDSWORK comment for relative_url
and thought about the memory allocation
D
By having the `init` functionality in C, we can reference it easier
from other parts in the code.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 107
git-submodule.sh| 39 +---
su
Johannes Schindelin writes:
> Also, you might want to join my discussion with Junio about the sense or
> nonsense of keeping the prefix parameter instead of silently removing it
> while moving the functions.
This is a tangent to Paul's topic, but it is an important tangent in
the other thread, i
Add commit.verbose configuration variable as a convenience for those
who always prefer --verbose.
Helped-by: Eric Sunshine
Signed-off-by: Pranit Bauva
---
The previous versions of this patch are:
- [v6] $gmane/288811
- [v5] $gmane/288728
- [v4] $gmane/288652
- [v3] $gmane/288634
- [v2] $gm
> On 08 Mar 2016, at 13:30, Torsten Bögershausen wrote:
>
>>> And if not, I can put it on my TODO-stack.
>> I have read through the official contribution guidelines and I think I can
>> send an official patch.
>>
>> In this case, would you prefer to have a single commit since the change
>> is r
On Mon, Mar 14, 2016 at 5:21 PM, Eric Sunshine wrote:
> This is missing the important "-c commit.verbose=false". Without it,
I meant "-c commit.verbose=true", of course.
> you're not really testing anything interesting.
>
> (It was missing in the "something like this" example test I typed
> dire
On Mon, Mar 14, 2016 at 5:29 PM, Eric Sunshine wrote:
> By the way, the just-submitted v6 seems to be lacking these new tests
> (though, as I said, they are not by any means mandatory).
Ignore me. They are present in v6, yet I somehow overlooked them.
--
To unsubscribe from this list: send the li
On Mon, Mar 14, 2016 at 3:09 PM, Pranit Bauva wrote:
> On Mon, Mar 14, 2016 at 1:54 PM, Eric Sunshine
> wrote:
>> Not at all mandatory, but it wouldn't hurt to add a couple additional tests:
>>
>> * commit.verbose=true and --verbose
>> * commit.verbose=false and --no-verbose
>
> I was thinking o
On Mon, Mar 14, 2016 at 5:21 PM, Eric Sunshine wrote:
>> +test_expect_success 'status ignores commit.verbose=true' '
>> + git status >actual &&
>
> This is missing the important "-c commit.verbose=false". Without it,
> you're not really testing anything interesting.
>
> (It was missing in th
On Mon, Mar 14, 2016 at 4:50 PM, Pranit Bauva wrote:
> Add commit.verbose configuration variable as a convenience for those
> who always prefer --verbose.
>
> Helped-by: Eric Sunshine
> Signed-off-by: Pranit Bauva
> ---
> diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
> index
Paul Tan writes:
> In the upcoming git-rebase to C rewrite, it is a common operation to
> refresh the index and write the resulting index.
>
> builtin/am.c already implements refresh_and_write_cache(), which is what
> we want. Move it to rebase-common.c, so that it can be shared with all
> the re
From: "Lars Schneider"
On 14 Mar 2016, at 07:57, Junio C Hamano wrote:
Lars Schneider writes:
I thought a while about this requirement and I wonder if a wrapper
called
'ggit' (guarded Git) could be a solution. The wrapper would pass all
command line arguments to 'git' and check for poten
Add commit.verbose configuration variable as a convenience for those
who always prefer --verbose.
Helped-by: Eric Sunshine
Signed-off-by: Pranit Bauva
---
The previous versions of this patch are:
- [v5] $gmane/288728
- [v4] $gmane/288652
- [v3] $gmane/288634
- [v2] $gmane/288569
- [v1] $gm
Hi Paul,
On Sat, 12 Mar 2016, Paul Tan wrote:
> In the upcoming git-rebase-to-C rewrite, it is a common operation to
> check if the worktree has unstaged changes, so that it can complain that
> the worktree is dirty.
>
> builtin/pull.c already implements this function. Move it to
> rebase-common
Hi Duy,
On Mon, 14 Mar 2016, Duy Nguyen wrote:
> On Sat, Mar 12, 2016 at 5:46 PM, Paul Tan wrote:
>
> > rebase-am.c| 110 +++
> > rebase-am.h| 22 +++
> > rebase-common.c| 220 ++
> > rebase-common
惠轶群 writes:
> After reading the
> [spec](https://specifications.freedesktop.org/basedir-spec/basedir-spec-0.7.html)
> more carefully, I think that $XDG_RUNTIME_DIR may be a better choice than
> the above two. For ~/.git-credential-cache/socket is a unix socket and should
> be used only runtime.
Hi Christian,
On Mon, 14 Mar 2016, Christian Couder wrote:
> On Sat, Mar 12, 2016 at 11:46 AM, Paul Tan wrote:
> > In an interactive rebase, commands are read and executed from a todo
> > list (.git/rebase-merge/git-rebase-todo) to perform the rebase.
> >
> > In the upcoming re-implementation of
On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan wrote:
> These functions can be used for loading and saving common rebase options
> into a state directory.
>
> Signed-off-by: Paul Tan
> ---
> rebase-common.c | 69
> +
> rebase-common.h | 4
Junio C Hamano writes:
>> Place the contents from SQUASH_MSG at the beginning, just like we
>> show the commit log skeleton first when concluding a normal merge,
>> and then show the "# Conflicts:" list, to help the user write the
>> log message for the resulting commit.
>>
>> Signed-off-by: Sven
On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan wrote:
> A non-root rebase takes 3 arguments:
>
> * branch_name -- the branch or commit that will be rebased. If it is not
> specified, the current branch is used.
>
> * upstream -- The upstream commit to compare against. If it is not
> specified, the
2016-03-14 23:42 GMT+08:00 Junio C Hamano :
> 惠轶群 writes:
>
>> I'm still confused about following:
>>
>> 1. should `~/.git-credential-cache` been moved to
>> `~/.cache/git/credential`(as the descreption of the micropject says)
>> or `~/.config/git/credential`(as the title of the microproject says)
On Mon, Mar 14, 2016 at 1:54 PM, Eric Sunshine wrote:
> On Sat, Mar 12, 2016 at 1:41 AM, Pranit Bauva wrote:
>> Add commit.verbose configuration variable as a convenience for those
>> who always prefer --verbose.
>>
>> Signed-off-by: Pranit Bauva
>> Mentored-by: Eric Sunshine
> More typical wo
Duy Nguyen writes:
> On Sat, Mar 12, 2016 at 5:46 PM, Paul Tan wrote:
>> So, we have around a 1.4x-1.8x speedup for Linux users, and a 1.7x-13x
>> speedup
>> for Windows users. The annoying long delay before the interactive editor is
>> launched on Windows is gotten rid of, which I'm very happy
If there are pending updates for the upcoming release, please let me
know and tell me what to pull.
Thanks.
--
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
Stefan Beller writes:
> you'd fetch as usual without moving the anchor point. You could have
> options like
>
> $ git fetch --recurse-submodules[=label/pattern]
> --unshallow-submodules[=label/pattern]
> ...
> So the first one should be shallowed after fetch, but the second would
> fetch or e
On Sat, Mar 12, 2016 at 2:46 AM, Paul Tan wrote:
"Unlike when doing git-am, "git am" kept working during the whole series
and being switched from the shell to the C implementation in the
last commit,
this time rebase is broken in the series, and built up from here again" ?
> @@ -505,9
Sven Strickroth writes:
> When concluding a conflicted "git merge --squash", the command
> failed to read SQUASH_MSG that was prepared by "git merge", and
> showed only the "# Conflicts:" list of conflicted paths.
>
> Place the contents from SQUASH_MSG at the beginning, just like we
> show the co
On Sat, Mar 12, 2016 at 11:29 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Why is it interesting for submodules but not for standard repositories?
>>
>> If I clone a repository without submodules, it is also not recorded
>> that I cloned with an explicit depth=1. If you fetch, you may e
Max Horn writes:
>> On 11 Mar 2016, at 00:04, Junio C Hamano wrote:
>> ...
>> * "branch --delete" has "branch -d" but "push --delete" does not.
>
> This states a problem, but not whether (and how) it was resolved?
Thanks; how about
* "push" learned that its "--delete" option can be shortened
On Mon, Mar 14, 2016 at 10:22:43AM +0300, Никита Соболев wrote:
> Robin, thank you for interest.
>
> I have not seen 'pwstore' before, but I don't like the idea to store
> headers inside the file. As it might break things. But I love the idea
> of groups and access rights. It is a direction I woul
Junio C Hamano writes:
> But if it makes it easier for translations teams and the i18n
> coordinator to work together if I also pulled the git.pot update
> myself, I'll do so. I just didn't know (and still don't know) if
> that makes things easier for you guys, or if that risks making
> things m
On Mon, Mar 14, 2016 at 5:15 AM, Duy Nguyen wrote:
> On Sat, Mar 12, 2016 at 5:46 PM, Paul Tan wrote:
>> So, we have around a 1.4x-1.8x speedup for Linux users, and a 1.7x-13x
>> speedup
>> for Windows users. The annoying long delay before the interactive editor is
>> launched on Windows is gott
Lars Schneider writes:
> On 14 Mar 2016, at 07:57, Junio C Hamano wrote:
>
>> I recall back in the days when people said that Hg's command set was
>> so much more pleasant to use that some people thought about building
>> Hg's command line UI on top of low level implementation of the Git's
>> da
Junio C Hamano writes:
> For the purpose of letting "git pull --rebase" make sure that there
> is no difference between the index and the working tree, we'd want a
> tree-wide diff, so we do not want to limit the diff with pathspec.
> Not passing "prefix" to init_revisions() _is_ the right thing.
Johannes Schindelin writes:
>> Another reason why it is more sensible to keep the prefix available,
>> but not use it to limit the extent of diff, to has_*_changes()
>> functions is that it would be easier for us to change our mind later
>> to allow the users to ask for more detailed output. Ins
On Monday 14 March 2016 11:44 AM, Jacob Keller wrote:
> On Sun, Mar 13, 2016 at 10:25 PM, Sidhant Sharma
> wrote:
>> On Monday 14 March 2016 04:58 AM, Jacob Keller wrote:
>>>
>>> If I recall correctly, a configuration setting was previously
>>> discussed but mostly discarded as a solution since
Michael J Gruber writes:
> The extra pair of parentheses keeps the l10n engine from picking up the
> string. Remove them so that "ahead " ends up in git.pot.
>
> Signed-off-by: Michael J Gruber
> ---
Thanks, will apply.
> wt-status.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Michael J Gruber writes:
> Have you pulled git.pot for 2.8.0 already? [1]
Thanks for bringing this up.
No, I never pull the "git.pot round N for release" myself, as I am
not working on any translations, and I expect that translation teams
work off of i18n coordinator's tree (i.e. Jiang's tree),
On Monday 14 March 2016 01:46 PM, Lars Schneider wrote:
> On 14 Mar 2016, at 07:57, Junio C Hamano wrote:
>
>> If "ggit" is made too limited, there is an issue. Beginners may at
>> some point need to transition to the real thing to fully exploit the
>> power of Git, and they may need to unlearn "
惠轶群 writes:
> I'm still confused about following:
>
> 1. should `~/.git-credential-cache` been moved to
> `~/.cache/git/credential`(as the descreption of the micropject says)
> or `~/.config/git/credential`(as the title of the microproject says)?
The latter, I'd think, as you noticed in 2. the f
The extra pair of parentheses keeps the l10n engine from picking up the
string. Remove them so that "ahead " ends up in git.pot.
Signed-off-by: Michael J Gruber
---
wt-status.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index ab4f80d..ef7486
Hi Junio,
Have you pulled git.pot for 2.8.0 already? [1]
Maybe I'm not up-to-date on the release cycle timing regarding l10n, but
I was trying to fix a mixed translation/non-translation issue, and it
turned out the reason is probably that it is not in "git.pot":
"behind " is in git.pot
"ahead "
I'm Hui Yiqun, a master degress candidate of Tsinghua University. I'd
like to participate GSOC 2016 as an developer of git.
I have basic knowledge about several programming languages (namely C,
python, go and etc.), compilers and cmake which may help my
development.
My github page is at [here](ht
Hi,
I'm Mary.
Would you be interested in acquiring an Email list of iPhone Users List from
USA?
We also have data for IMac Users, iPod Users, Android Users, Windows Users, PC
Users, Sumsung Users, Tablet Users, Web Developers, Gamers List, Xbom Gamers,
Casino Players, Poker Players and man
Hi Mikael,
On Fri, 11 Mar 2016, Mikael Magnusson wrote:
> On Thu, Mar 10, 2016 at 2:21 PM, Johannes Schindelin
> wrote:
> > Hi Duy,
> >
> > On Thu, 10 Mar 2016, Duy Nguyen wrote:
> >
> >> On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin
> >> wrote:
> >> > One possible improvement would be t
On Sat, Mar 12, 2016 at 11:46 AM, Paul Tan wrote:
> In an interactive rebase, commands are read and executed from a todo
> list (.git/rebase-merge/git-rebase-todo) to perform the rebase.
>
> In the upcoming re-implementation of git-rebase -i in C, it is useful to
> be able to parse each command in
Hi Junio,
On Thu, 10 Mar 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > I think this is quite subjective, as I tend to take the presence of
> > "prefix" to mean "the callee assumes that the caller has gone up to
> > the root level already", and take the absense of use of "prefix" in
On Sat, Mar 12, 2016 at 5:46 PM, Paul Tan wrote:
> So, we have around a 1.4x-1.8x speedup for Linux users, and a 1.7x-13x speedup
> for Windows users. The annoying long delay before the interactive editor is
> launched on Windows is gotten rid of, which I'm very happy about :-)
Nice numbers :-) S
Please bottom post - see below.
Javier Domingo Cansino venit, vidit, dixit 12.03.2016 03:48:
> dash is usually used for representing stdin / stdout as a file. I
> think this could drive to error... but I would agree with transforming
> -h1 to @{-1} or -h2 to @{-2} (-h representing head).
>
> I do
On Sat, Mar 12, 2016 at 1:41 AM, Pranit Bauva wrote:
> Add commit.verbose configuration variable as a convenience for those
> who always prefer --verbose.
>
> Signed-off-by: Pranit Bauva
> Mentored-by: Eric Sunshine
More typical would be to say Helped-by: rather than Mentored-by:.
Also, place
On 14 Mar 2016, at 07:57, Junio C Hamano wrote:
> Lars Schneider writes:
>
>> I thought a while about this requirement and I wonder if a wrapper called
>> 'ggit' (guarded Git) could be a solution. The wrapper would pass all
>> command line arguments to 'git' and check for potentially destruc
Robin, thank you for interest.
I have not seen 'pwstore' before, but I don't like the idea to store
headers inside the file. As it might break things. But I love the idea
of groups and access rights. It is a direction I would like to follow.
Also I like your suggestion about the key's white-list.
Kevin Daudt writes:
> On Mon, Mar 14, 2016 at 12:03:33AM +0530, Sidhant Sharma wrote:
>>
>>
>>
>> Other than this, I also tried to expand the list of potentially destructive
>> commands and updated the list as follows (additions in brackets):
>>
>> * git rebase [ git pull --rebase ]
>> * git
63 matches
Mail list logo
