On 2016-01-22 20.04, Johannes Schindelin wrote:
> Hi Junio,
>
> On Fri, 22 Jan 2016, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>>> Signed-off-by: Johannes Schindelin
>>> ---
>>
>> This change somehow ringed a bell and reminded me of your recent
>> ls-files stuff. Are there thin
On 2016-01-22 18.01, Johannes Schindelin wrote:
> From: Beat Bolli
>
> When merging files in repos with core.eol = crlf, git merge-file inserts
> just a LF at the end of the merge markers. Files with mixed line endings
> cause trouble in Windows editors and e.g. contrib/git-jump, where an
> unmer
On 2016-01-22 18.01, Johannes Schindelin wrote:
> Signed-off-by: Johannes Schindelin
> ---
> convert.c | 29 +
> convert.h | 2 ++
> 2 files changed, 31 insertions(+)
>
> diff --git a/convert.c b/convert.c
> index 814e814..b458734 100644
> --- a/convert.c
> +++ b/con
While playing around git stash I noticed that some options were
missing. I have updated these in the BASH completions file. Note
that this is not a comprehensive review, but adds the options that
I use in git-stash, and a nearby missing option.
Paul Wagland (2):
Update the flags for git show-bra
Signed-off-by: Paul Wagland
---
contrib/completion/git-completion.bash | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 63754bc..043d5bb 100644
--- a/contrib/completion/git
Signed-off-by: Paul Wagland
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index ab4da7f..63754bc 100644
--- a/contrib/completion/git-completion.bash
++
On Wed, Jan 20, 2016 at 1:59 AM, Christian Couder
wrote:
> When we know that mtime on directory the environment gives us is
> usable for the purpose of untracked cache, we may want the
> untracked cache to be always used by default without any mtime
> test or kernel name check being performed.
I
On Wed, Jan 20, 2016 at 4:59 PM, Christian Couder
wrote:
> diff --git a/read-cache.c b/read-cache.c
> index 84616c8..1d5696c 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -1622,6 +1622,20 @@ int read_index_from(struct index_state *istate, const
> char *path)
> return istat
On Wed, Jan 20, 2016 at 4:59 PM, Christian Couder
wrote:
> Signed-off-by: Christian Couder
> Helped-by: Duy Nguyen
Nit. I think usually your s-o-b comes last
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majo
When invoking clone with the --init-submodule option, the choice will be
recorded in the submodule.autoInitialize config option.
Signed-off-by: Stefan Beller
---
Documentation/git-clone.txt | 6 +++
builtin/clone.c | 40 --
t/t7400-submodule-basic.sh | 101 +++
This series introduces labels which you can attach to submodules like so:
$ cat .gitmodules
[submodule "gcc"]
path = gcc
url = git://...
label = default
label = devel
[submodule "linux"]
path = linux
url = git://...
label = defaul
We need the submodule groups in a later patch.
Signed-off-by: Stefan Beller
---
submodule-config.c | 15 +++
submodule-config.h | 2 ++
2 files changed, 17 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index a32259e..245a0f6 100644
--- a/submodule-config.c
+++
All submodules which are selected via submodule.autoInitialize
are initialized if they were not initialized before updating
the submodules.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 56 -
t/t7400-submodule-basic.sh | 32 ++
When adding new submodules, you can specify the
label(s) the submodule belongs to by giving one or more
--label arguments. This will record each label in the
.gitmodules file as a value of the key
"submodule.$NAME.label".
Signed-off-by: Stefan Beller
---
Documentation/git-submodule.txt | 5
The registration of the submodule will be reported to stderr, as that is
consistent with the rest of progress reporting within Git.
This helps us in a later patch when we want to reuse the
init_submodule function in update_clone whose stdout will be piped
to shell which reads parameters off stdout
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 sb/submodule-parallel-update, replacing
sb/submodule-init.
Fixes:
* a more faithful conversion by staying on stdout (We switch to stderr later
in another series)
* use the existing find_last_dir_sep instead of reinventing the wheel.
Stefan Beller (2):
submodule: por
By having the `init` functionality in C, we can reference it easier
from other parts in the code.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 115 ++--
git-submodule.sh| 39 +--
2 files changed, 111 insertions(+)
On Fri, Jan 22, 2016 at 10:52:47PM +, Ashish Yadav wrote:
> Thanks.
>
> I just wanted to know if I can upgrade straight from v1.7.1-3 to v2.7 or
> do I need to upgrade to an intermediate version.
No, there should no reason to need an intermediate version.
-Peff
--
To unsubscribe from this l
Thanks.
I just wanted to know if I can upgrade straight from v1.7.1-3 to v2.7 or
do I need to upgrade to an intermediate version.
On 1/22/16, 4:42 PM, "Matthieu Moy" wrote:
>Jeff King writes:
>
>> On Fri, Jan 22, 2016 at 05:15:23PM +, Ashish Yadav wrote:
>>
>>> I am using git v1.7.12.4 w
Signed-off-by: Jean-Noel Avila
---
po/fr.po | 761 +++
1 file changed, 373 insertions(+), 388 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 80f72fb..2e55c89 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,14 +3,14 @@
# This file is di
Jeff King writes:
> On Fri, Jan 22, 2016 at 05:15:23PM +, Ashish Yadav wrote:
>
>> I am using git v1.7.12.4 w CentOS 6.5. Can I upgrade 1.7.1-3 to 2.7?
>
> Probably. :)
Surely ;-).
I have a CentOS 6.5 with Git 2.6 on it. It was installed from source
(I'm not the one who installed it, but I
On Fri, Jan 22, 2016 at 02:36:54PM -0800, Stefan Beller wrote:
> Impressive performance improvements. :)
"Accidentally quadratic" bugs are some of my favorites, because it's
usually easy to show off the results. Of course, the repo in p7300 is
pretty ridiculous, and most people won't see any spee
On Fri, Jan 22, 2016 at 05:15:23PM +, Ashish Yadav wrote:
> I am using git v1.7.12.4 w CentOS 6.5. Can I upgrade 1.7.1-3 to 2.7?
Probably. :)
I don't know much about what has been packaged for CentOS 6.5, but you
can certainly build the latest version of git from source. You can get
tarballs
Impressive performance improvements. :)
On Fri, Jan 22, 2016 at 2:31 PM, Jeff King wrote:
> BTW, what if you have
> precious content in a ".git" file?
I'd kindly ask to use a different version control in that case.
Q: What can you use Git for?
A: Everything including version control, backup,
Signed-off-by: Jean-Noel Avila
---
po/fr.po | 96 +++-
1 file changed, 46 insertions(+), 50 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 2e55c89..c44f994 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id
On Fri, Jan 22, 2016 at 2:30 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> By having the `init` functionality in C, we can reference it easier
>> from other parts in the code.
>>
>> Signed-off-by: Stefan Beller
>> ---
>>
>> Hi Junio,
>>
>> please replace the top-most patch of sb/submodu
On Fri, Jan 22, 2016 at 05:29:30PM -0500, Jeff King wrote:
> diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
> index 88be904..c525656 100755
> --- a/t/t3000-ls-files-others.sh
> +++ b/t/t3000-ls-files-others.sh
> @@ -65,6 +65,13 @@ test_expect_success '--no-empty-directory hid
Stefan Beller writes:
> By having the `init` functionality in C, we can reference it easier
> from other parts in the code.
>
> Signed-off-by: Stefan Beller
> ---
>
> Hi Junio,
>
> please replace the top-most patch of sb/submodule-init with this patch.
Will do, but it seems that you'd have to b
When we want to look up a submodule ref, we use
get_ref_cache(path) to find or auto-create its ref cache.
But if we feed a path that isn't actually a git repository,
we blindly create the ref cache, and then may die deeper in
the code when we try to access it. This is a problem because
many callers
We have always had is_git_directory(), for looking at a
specific directory to see if it contains a git repo. In
0179ca7 (clean: improve performance when removing lots of
directories, 2015-06-15), we added is_git_repository() which
checks for a non-bare repository by looking at its ".git"
entry.
Ho
On Fri, Jan 22, 2016 at 04:18:03PM -0500, Jeff King wrote:
> But I think this is another case of
>
> http://thread.gmane.org/gmane.comp.version-control.git/265560/focus=281253
>
> There the question was about performance (lots of these clog up the
> linear ref_cache list), but I think the root
When using push --force the output reports if the reference(s) was
force-updated:
$ git push --force origin origin/master^:master
Total 0 (delta 0), reused 0 (delta 0)
To /home/thf876/gittest/m
+ cc44495...8302fcb origin/master^ -> master (forced update)
But when using push --force-with-lease t
On Fri, Jan 22, 2016 at 04:17:29PM +0700, Duy Nguyen wrote:
> $ git init abc
> $ cd abc
> $ mkdir def
> $ echo 'gitdir: blah blah' >def/.git
> $ git ls-files -o
> fatal: Not a git repository: def/blah blah
>
> If some directory looks like a submodule but turns out not, that's not
> a fatal error.
Am 21.01.2016 um 01:18 schrieb Junio C Hamano:
> Thomas Braun writes:
>
>> Signed-off-by: Thomas Braun
>> ---
>> contrib/completion/git-completion.bash | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/contrib/completion/git-completion.bash
>> b/contrib/completion/git-
On Fri, Jan 22, 2016 at 11:03 AM, Johannes Sixt wrote:
> Am 20.01.2016 um 03:03 schrieb Stefan Beller:
>> +static char *last_dir_separator(char *str)
>> +{
>> + char *p = str + strlen(str);
>> + while (p-- > str)
>> + if (is_dir_sep(*p))
>> + return p;
>> +
While unpacking trees (e.g. during git checkout), when we hit a cache
entry that's past and outside our path, we cut off iteration.
This provides about a 45% speedup on git checkout between master and
master^2 on Twitter's monorepo. Speedup in general will depend on
repostitory structure, num
On Fri, Jan 22, 2016 at 2:50 PM, Eric Sunshine wrote:
> On Fri, Jan 22, 2016 at 06:01:25PM +0100, Johannes Schindelin wrote:
>> +test_expect_success 'conflict markers contain CRLF when core.eol=crlf' '
>> + test_must_fail git -c core.eol=crlf merge-file -p \
>> + nolf-diff1.txt nol
On Fri, Jan 22, 2016 at 06:01:25PM +0100, Johannes Schindelin wrote:
> When merging files in repos with core.eol = crlf, git merge-file inserts
> just a LF at the end of the merge markers. Files with mixed line endings
> cause trouble in Windows editors and e.g. contrib/git-jump, where an
> unmerge
Johannes Sixt writes:
> I suggest to move the function definition out of line:
>
> diff --git a/compat/mingw.c b/compat/mingw.c
> index 10a51c0..0cebb61 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -1915,6 +1915,13 @@ pid_t waitpid(pid_t pid, int *status, int options)
> return
Johannes Schindelin writes:
>> > It is the duty of ll_merge()'s *caller* (in case of Git's `merge`
>> > command, the merge_content() function) to convert the merge result
>> > into the correct working file contents, and ll_merge() should not muck
>> > with line endings at all.
>>
>> Hmph, aren't
Hi Junio,
On Fri, 22 Jan 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Signed-off-by: Johannes Schindelin
> > ---
>
> This change somehow ringed a bell and reminded me of your recent
> ls-files stuff. Are there things that these topics can use from
> each other?
Quite poss
Am 20.01.2016 um 03:03 schrieb Stefan Beller:
> +static char *last_dir_separator(char *str)
> +{
> + char *p = str + strlen(str);
> + while (p-- > str)
> + if (is_dir_sep(*p))
> + return p;
> + return NULL;
> +}
> +
I just noticed that we already have th
Hi Junio,
On Fri, 22 Jan 2016, Junio C Hamano wrote:
> Matthieu Moy writes:
>
> > Johannes Schindelin writes:
> >
> >> wt-status.c | 22 +++---
> >> 1 file changed, 15 insertions(+), 7 deletions(-)
> >
> > Looks good to me. You may want to add a test by overriding $EDITOR to a
On Fri, Jan 22, 2016 at 10:00 AM, Santiago Torres wrote:
> On Thu, Jan 14, 2016 at 09:21:28AM -0800, Stefan Beller wrote:
>> On Thu, Jan 14, 2016 at 9:16 AM, Santiago Torres wrote:
>> > Hello Stefan, thanks for your feedback again.
>> >
>> >> This is what push certs ought to solve already?
>> >
>
Am 12.01.2016 um 08:57 schrieb Johannes Schindelin:
> diff --git a/compat/mingw.h b/compat/mingw.h
> index 57ca477..b3e5044 100644
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -361,7 +361,15 @@ HANDLE winansi_get_osfhandle(int fd);
>* git specific compatibility
>*/
>
> -#define has
Johannes Schindelin writes:
> Signed-off-by: Johannes Schindelin
> ---
This change somehow ringed a bell and reminded me of your recent
ls-files stuff. Are there things that these topics can use from
each other?
These topics are similar in that they add many lines of code as
"helpers" that in
Hi Junio,
On Fri, 22 Jan 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The original version of this patch also modified ll_merge(), but that
> > was incorrect: low-level merge operates on blobs, not on working
> > files. Therefore, the data passed to the low-level merge, as w
Matthieu Moy writes:
> Johannes Schindelin writes:
>
>> wt-status.c | 22 +++---
>> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> Looks good to me. You may want to add a test by overriding $EDITOR to a
> script doing "git status >actual" if you want to have fun with testi
Johannes Schindelin writes:
> The original version of this patch also modified ll_merge(), but that
> was incorrect: low-level merge operates on blobs, not on working files.
> Therefore, the data passed to the low-level merge, as well as its
> result, is expected to have LF-only line endings.
>
>
On Thu, Jan 14, 2016 at 09:21:28AM -0800, Stefan Beller wrote:
> On Thu, Jan 14, 2016 at 9:16 AM, Santiago Torres wrote:
> > Hello Stefan, thanks for your feedback again.
> >
> >> This is what push certs ought to solve already?
> >
> > Yes, they aim to solve the same issue. Unfortunately, push cer
On Fri, Jan 22, 2016 at 05:22:16PM +, Draggs, Tori wrote:
> I apologize, however my intent in reaching out was not to seek free of cost
> help desk services.
Don't worry, just use reply to all so everyone can see and chime in if
they can help.
> > Hi. I am able to pull up Visual Studio Code
Johannes Schindelin writes:
> On Wed, 20 Jan 2016, Junio C Hamano wrote:
>
>> * bb/merge-marker-crlf (2015-11-24) 1 commit
>> - merge-file: consider core.crlf when writing merge markers
>>
>> Write out merge markers using system end-of-line convention.
>>
>> Waiting for a re-roll to handle g
On 22.01.16 18:01, Johannes Schindelin wrote:
> The original patch was sent by Beat Bolli in
> http://thread.gmane.org/gmane.comp.version-control.git/281600
>
> My suggestion to extend it to respect gitattributes led to
> changes that broke the original patch.
>
> Since there have been a couple o
I apologize, however my intent in reaching out was not to seek free of cost
help desk services. After speaking with Apple they suggested that I contact
both Git and Code developers for feedback on the commands I used prior to the
potential file removal.
I appreciate your assistance thus far
Duy Nguyen writes:
> I started moving my git work space to multi-worktree and found it
> annoying that every time I add a new worktree, my first step must be
> copy my config.mak over. Room for improvement. I see three options:
4) none of the above.
Everybody should learn to think before utteri
I am using git v1.7.12.4 w CentOS 6.5. Can I upgrade 1.7.1-3 to 2.7?
--
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
Duy Nguyen writes:
> The problem with indexing notes tree by blob is how the user will
> manage it.
I do not think they have to be incompatible goals. Allowing the
user to specify "at this commit, this path was moved to that path"
may be a good thing. But at the same time, using a better data
Hi Matthieu,
On Fri, 22 Jan 2016, Matthieu Moy wrote:
> Johannes Schindelin writes:
>
> > wt-status.c | 22 +++---
> > 1 file changed, 15 insertions(+), 7 deletions(-)
>
> Looks good to me. You may want to add a test by overriding $EDITOR to a
> script doing "git status >actua
Hi Tori,
please reply-to-all. I really have no time to serve as your personal,
free-of-cost help desk. But I am willing to help on the mailing list.
On Fri, 22 Jan 2016, Draggs, Tori wrote:
> Hi. I am able to pull up Visual Studio Code. But none of my local
> files. I tried using the magnifyi
The original patch was sent by Beat Bolli in
http://thread.gmane.org/gmane.comp.version-control.git/281600
My suggestion to extend it to respect gitattributes led to
changes that broke the original patch.
Since there have been a couple of "What's cooking" mails
containing unheard calls for update
Signed-off-by: Johannes Schindelin
---
convert.c | 29 +
convert.h | 2 ++
2 files changed, 31 insertions(+)
diff --git a/convert.c b/convert.c
index 814e814..b458734 100644
--- a/convert.c
+++ b/convert.c
@@ -758,6 +758,35 @@ static void convert_attrs(struct conv_at
From: Beat Bolli
When merging files in repos with core.eol = crlf, git merge-file inserts
just a LF at the end of the merge markers. Files with mixed line endings
cause trouble in Windows editors and e.g. contrib/git-jump, where an
unmerged file in a run of "git jump merge" is reported as simply
Hi Junio,
On Wed, 20 Jan 2016, Junio C Hamano wrote:
> * bb/merge-marker-crlf (2015-11-24) 1 commit
> - merge-file: consider core.crlf when writing merge markers
>
> Write out merge markers using system end-of-line convention.
>
> Waiting for a re-roll to handle gitattributes.
> ($gmane/281
Hi Tori,
On Wed, 20 Jan 2016, Draggs, Tori wrote:
> Specs:
> MacBook Pro
> OS X Yosemite
> 2.6 GHz Intel Core i5, 8GN 1600 MHz DDR3
>
> After selecting the Git option in a recent install of Visual Studio Code
> 2015 for MAC, my filesystem was removed.
Can you call Visual Studio Code? If so, th
Johannes Schindelin writes:
> wt-status.c | 22 +++---
> 1 file changed, 15 insertions(+), 7 deletions(-)
Looks good to me. You may want to add a test by overriding $EDITOR to a
script doing "git status >actual" if you want to have fun with testing.
Thanks,
--
Matthieu Moy
ht
From: Junio C Hamano
Some developers might want to call `git status` in a working
directory where they just started an interactive rebase, but the
edit script is still opened in the editor.
Let's show a meaningful message in such cases.
[jes: suppressed the "No commands remaining" message when
Hi,
[Stefan, please do not drop me from the Cc: list ;-)]
On Thu, 21 Jan 2016, Junio C Hamano wrote:
> Perhaps something along this line (not tested and done on 'pu', so I
> am not committing it to anywhere myself)?
I like it!
I tested it, amended it and am about to send out a mail with a comm
Hello all,
On 01/14/2016 09:15 PM, Junio C Hamano wrote:
> Eric Wong writes:
>
>> Error messages should attempt to fit within the confines of
>> an 80-column terminal to avoid compatibility and accessibility
>> problems. Furthermore the word "directories" can be misleading
>> when used in the co
> On 21 Jan 2016, at 9:38 pm, Jeff King wrote:
> But note that your whole test is going to be racy, and possibly depend
> on the resolution of your filesystem's timestamps. Did you run your test
> as a single script, where the initial index write and the `touch` may
> happen in the same second? If
I started moving my git work space to multi-worktree and found it
annoying that every time I add a new worktree, my first step must be
copy my config.mak over. Room for improvement. I see three options:
1) add an option in 'worktree add' to copy all untracked files from
current worktree over
Only
$ git init abc
$ cd abc
$ mkdir def
$ echo 'gitdir: blah blah' >def/.git
$ git ls-files -o
fatal: Not a git repository: def/blah blah
If some directory looks like a submodule but turns out not, that's not
a fatal error. The stack trace is something like this. I suspect
do_submodule_path should use
On Tue, Jan 19, 2016 at 05:44:22PM -0800, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > On Wed, Jan 20, 2016 at 6:41 AM, Junio C Hamano wrote:
> >
> >> The only sensible thing we can do at that point in the code after
> >> re-reading the index is to make sure that hasn't been changed by the
>
On Thu, Jan 21, 2016 at 10:56 PM, Stefan Beller wrote:
>>> [submodule "gcc"]
>>> path = gcc
>>> url = git://...
>>> groups = default
>>> groups = devel
>>
>> On the quick I was unable to find the rationale why entries are now stored
>> as separated lines compa
The current update_linked_gitdir() has a bug that can create "gitdir"
file in non-multi-worktree setup. Worse, sometimes it can write relative
path to "gitdir" file, which will not work (e.g. "git worktree list"
will display the worktree's location incorrectly)
Instead of fixing this, we step back
v3 kills the update_linked_gitdir's replacement in v2. I'll come back
to "worktree mv" (and think more about hardlink support) once I'm done
with worktree's config split.
Nguyễn Thái Ngọc Duy (2):
worktree.c: fix indentation
worktree: stop supporting moving worktrees manually
Documentation/g
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/worktree.c b/worktree.c
index 981f810..6181a66 100644
--- a/worktree.c
+++ b/worktree.c
@@ -176,10 +176,10 @@ struct worktree **get_worktrees(void)
77 matches
Mail list logo
