Am 01.12.2016 um 02:28 schrieb Brandon Williams:
+ git init "su:b" &&
Don't do that. Colons in file names won't work on Windows.
-- Hannes
On Thu, Dec 01, 2016 at 08:09:16AM +0100, Johannes Sixt wrote:
> Am 01.12.2016 um 00:40 schrieb Jeff King:
> > 20813 access("su:b/../.git/modules/su:b/refs", X_OK) = 0
>
> Side note: where does this weirdness "su:b" come from? (I haven't looked at
> any of the patches, yet, let alone tested.) Col
Am 01.12.2016 um 00:40 schrieb Jeff King:
20813 access("su:b/../.git/modules/su:b/refs", X_OK) = 0
Side note: where does this weirdness "su:b" come from? (I haven't looked
at any of the patches, yet, let alone tested.) Colons in file or
directory names won't work on Windows (in the way one wo
On Wed, Nov 30, 2016 at 04:15:33PM -0800, Steven Noonan wrote:
> It seems like it's behaving as though I've provided
> --pack-kept-objects. In order to ensure the .bitmap is created, it
> repacks everything, including everything in existing .pack files (not
> respecting .keep). But then it's not d
On Wed, Nov 30, 2016 at 11:26:43PM -0500, Anders Kaseorg wrote:
> > So I suspect a better strategy in general is to just override the
> > uname_* variables when cross-compiling.
>
> The specific case of an i386 userspace on an x86_64 kernel is important
> independently of the general cross compi
Although XDL_FAST_HASH computes hashes slightly faster on some
architectures, its collision characteristics are much worse, resulting
in some pathological diffs running over 100x slower
(http://public-inbox.org/git/20141222041944.ga...@peff.net/).
Furthermore, it was being enabled when ‘uname -m’
On Wed, Nov 30, 2016 at 05:28:29PM -0800, Brandon Williams wrote:
> +/*
> + * Determine if a submodule has been populated at a given 'path'
> + */
> +int is_submodule_populated(const char *path)
> +{
> + int ret = 0;
> + struct stat st;
> + char *gitdir = xstrfmt("%s/.git", path);
> +
Although XDL_FAST_HASH computes hashes slightly faster on some
architectures, its collision characteristics are much worse, resulting
in some pathological diffs running over 100x slower
(http://public-inbox.org/git/20141222041944.ga...@peff.net/).
Furthermore, it was being enabled when ‘uname -m’
On Wed, Nov 30, 2016 at 05:28:28PM -0800, Brandon Williams wrote:
> v6 fixes a race condition which existed in the 'is_submodule_populated'
> function. Instead of calling 'resolve_gitdir' to check for the existance of a
> .git file/directory, use 'stat'. 'resolve_gitdir' calls 'chdir' which can
On Thu, Dec 01, 2016 at 01:18:35AM +, Ramsay Jones wrote:
> >> I forgot, we ended up reversing course later and silencing them:
> >>
> >> http://public-inbox.org/git/20140505052117.gc6...@sigill.intra.peff.net/
> >>
> >> By the rationale of that conversation, we should be doing:
> >>
> >>
[resend; the original had an outdated address for Thomas, and I would
definitely like his blessing before removing XDL_FAST_HASH].
On Wed, Nov 30, 2016 at 10:04:07PM -0500, Anders Kaseorg wrote:
> Previously, XDL_FAST_HASH was defined when ‘uname -m’ returns x86_64,
> even if we are cross-compil
On Wed, Nov 30, 2016 at 10:04:07PM -0500, Anders Kaseorg wrote:
> Previously, XDL_FAST_HASH was defined when ‘uname -m’ returns x86_64,
> even if we are cross-compiling for a different architecture. Check
> the __x86_64__ compiler macro instead.
>
> In addition to fixing the cross compilation bu
Previously, XDL_FAST_HASH was defined when ‘uname -m’ returns x86_64,
even if we are cross-compiling for a different architecture. Check
the __x86_64__ compiler macro instead.
In addition to fixing the cross compilation bug, this is needed to
pass the Debian build reproducibility test
(https://te
Allow grep to recognize submodules and recursively search for patterns in
each submodule. This is done by forking off a process to recursively
call grep on each submodule. The top level --super-prefix option is
used to pass a path to the submodule which can in turn be used to
prepend to output or
If a submodule was renamed at any point since it's inception then if you
were to try and grep on a commit prior to the submodule being moved, you
wouldn't be able to find a working directory for the submodule since the
path in the past is different from the current path.
This patch teaches grep to
Add `GREP_SOURCE_SUBMODULE` as a grep_source type and cases for this new
type in the various switch statements in grep.c.
When initializing a grep_source with type `GREP_SOURCE_SUBMODULE` the
identifier can either be NULL (to indicate that the working tree will be
used) or a SHA1 (the REV of the s
teach submodules to load a '.gitmodules' file from a commit sha1. This
enables the population of the submodule_cache to be based on the state
of the '.gitmodules' file from a particular commit.
Signed-off-by: Brandon Williams
---
cache.h| 2 ++
config.c | 8
sub
Teach grep to recursively search in submodules when provided with a
object. This allows grep to search a submodule based on the state
of the submodule that is present in a commit of the super project.
When grep is provided with a object, the name of the object is
prefixed to all output. In orde
Add two helper functions to submodules.c.
`is_submodule_initialized()` checks if a submodule has been initialized
at a given path and `is_submodule_populated()` check if a submodule
has been checked out at a given path.
Signed-off-by: Brandon Williams
---
submodule.c | 39 +++
v6 fixes a race condition which existed in the 'is_submodule_populated'
function. Instead of calling 'resolve_gitdir' to check for the existance of a
.git file/directory, use 'stat'. 'resolve_gitdir' calls 'chdir' which can
affect other running threads trying to load thier files into a buffer in
Found via shellcheck
In Documentation/install-webdoc.sh line 21:
mkdir -p $(dirname "$T/$h")
^-- SC2046: Quote this to prevent word splitting.
--
-Austin
GPG: 14FB D7EA A041 937B
From 1050538f252d22311185065ab8837c71b17003fb Mon Sep 17 00:00:00 2001
From: Austin English
On 11/30, Stefan Beller wrote:
> > Oh interesting, I wonder if there is a way to not have to perform a
> > chdir since taking a lock to lstat wouldn't be ideal.
>
> I think we could rewrite is_submodule_populated to be
>
> int is_submodule_populated_cheap_with_no_chdir(char *path)
> {
> retur
On 30/11/16 23:46, Junio C Hamano wrote:
> Jeff King writes:
>
>> I forgot, we ended up reversing course later and silencing them:
>>
>> http://public-inbox.org/git/20140505052117.gc6...@sigill.intra.peff.net/
>>
>> By the rationale of that conversation, we should be doing:
>>
>> warning("%
Commit f8ec916 ("Allow helpers to report in "list" command that the ref
is unchanged", 2009-11-17) allowed a remote helper to report that a ref
is unchanged even if it did not know the contents of a ref. However,
that commit also made Git wrongly assume that such a remote ref always
has the content
Commit f8ec916 ("Allow helpers to report in "list" command that the ref
is unchanged", 2009-11-17) allowed a remote helper to report that a ref
is unchanged even if it did not know the contents of a ref. However,
that commit also made Git assume that such a remote ref has the contents
of the local
Hello,
A donation has been made out to you and your family from my foundation.
For details, send an E-mail now to: castrat...@gmail.com
Regards
On Wed, Nov 30, 2016 at 04:06:05PM -0800, Brandon Williams wrote:
> On 11/30, Jeff King wrote:
> > So I think there is some other chdir(). I'm not sure if there is an easy
> > way to get a backtrace on every call to chdir() in every thread. I'm
> > sure somebody more clever than me could figure ou
I have some unexpected behavior with 'git repack' on git 2.10.2 and 2.11.0.
$ cat /etc/gitconfig
[pack]
writeBitmapHashCache = true
[repack]
writeBitmaps = true
$ touch objects/pack/pack-3841d81123a96cedeb3c1bd7acf7e29bfba26639.keep
$ find objects
objects
objects/pack
objects/pack/
> Oh interesting, I wonder if there is a way to not have to perform a
> chdir since taking a lock to lstat wouldn't be ideal.
I think we could rewrite is_submodule_populated to be
int is_submodule_populated_cheap_with_no_chdir(char *path)
{
return stat(path + ".git")
}
i.e. just take the pre
On 11/30, Jeff King wrote:
> On Wed, Nov 30, 2016 at 06:59:52PM -0500, Jeff King wrote:
>
> > So I think there is some other chdir(). I'm not sure if there is an easy
> > way to get a backtrace on every call to chdir() in every thread. I'm
> > sure somebody more clever than me could figure out how
On 11/30, Jeff King wrote:
> So I think there is some other chdir(). I'm not sure if there is an easy
> way to get a backtrace on every call to chdir() in every thread. I'm
> sure somebody more clever than me could figure out how to make gdb do it
> automatically, but it might be workable manually.
On Wed, Nov 30, 2016 at 06:59:52PM -0500, Jeff King wrote:
> So I think there is some other chdir(). I'm not sure if there is an easy
> way to get a backtrace on every call to chdir() in every thread. I'm
> sure somebody more clever than me could figure out how to make gdb do it
> automatically, b
On Wed, Nov 30, 2016 at 06:46:36PM -0500, Jeff King wrote:
> > For now the work around could be to just pass "-C " to the child
> > process instead of relying on run-command to chdir.
>
> Yeah, that would push it after the exec. I just don't understand why
> that would be necessary.
Hmm. It stil
On 11/30, Jeff King wrote:
> On Wed, Nov 30, 2016 at 03:42:48PM -0800, Brandon Williams wrote:
>
> > > where 20813 and 20867 are two threads of the main process. One is doing
> > > the lstat and the other calls chdir at the same moment.
> >
> > Yeah so it looks like the start_command function call
Jeff King writes:
> I forgot, we ended up reversing course later and silencing them:
>
> http://public-inbox.org/git/20140505052117.gc6...@sigill.intra.peff.net/
>
> By the rationale of that conversation, we should be doing:
>
> warning("%s", "");
>
> here.
I forgot too. Thanks for digging
On Wed, Nov 30, 2016 at 03:42:48PM -0800, Brandon Williams wrote:
> > where 20813 and 20867 are two threads of the main process. One is doing
> > the lstat and the other calls chdir at the same moment.
>
> Yeah so it looks like the start_command function calls chdir. Which
> means any uses of the
On 11/30, Jeff King wrote:
> On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote:
>
> > On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote:
> >
> > > So I couldn't find a race condition in the code. I tracked the problem
> > > to grep_source_load_file which attempts to run ls
On Wed, Nov 30, 2016 at 3:40 PM, Jeff King wrote:
> On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote:
>
>> On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote:
>>
>> > So I couldn't find a race condition in the code. I tracked the problem
>> > to grep_source_load_file which
On Wed, Nov 30, 2016 at 06:32:04PM -0500, Jeff King wrote:
> On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote:
>
> > So I couldn't find a race condition in the code. I tracked the problem
> > to grep_source_load_file which attempts to run lstat on the file so that
> > it can read
On Wed, Nov 30, 2016 at 03:30:09PM -0800, Junio C Hamano wrote:
> Christian Couder writes:
>
> > From: Jeff King
> >
> > Signed-off-by: Christian Couder
> > ---
>
> By the time the series loses RFC prefix, we'd need to see the above
> three lines straightened out a bit more, e.g. a real messa
On Wed, Nov 30, 2016 at 03:28:23PM -0800, Brandon Williams wrote:
> So I couldn't find a race condition in the code. I tracked the problem
> to grep_source_load_file which attempts to run lstat on the file so that
> it can read it into a buffer. The lstat call fails with ENOENT (which
> convenie
Christian Couder writes:
> From: Jeff King
>
> Signed-off-by: Christian Couder
> ---
By the time the series loses RFC prefix, we'd need to see the above
three lines straightened out a bit more, e.g. a real message and a
more proper sign-off sequence.
> +static struct odb_helper *find_or_creat
On 11/30, Brandon Williams wrote:
> On 11/29, Jeff King wrote:
> > On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote:
> >
> > > 2. Grep threads doing more complicated stuff that needs to take a
> > > lock. You might try building with -fsanitize=thread to see if it
> > > turns u
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 6c6da5cf4f..3c868cad4c 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -66,4 +66,12 @@ test_expect_
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index fe85413725..0f1bb97f38 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -7,6 +7,10 @@ test_d
On Wed, Nov 30, 2016 at 10:37:40PM +, Ramsay Jones wrote:
> > Anyway. Those are all options, but I don't think there is any problem
> > with sticking with warning("") for now. It is not the first part of the
> > code that tickles the format-zero-length warning.
>
> Hmm, well I have been build
Junio C Hamano forgot to Cc: the author of the
most relevant change to the issue, d426430e6e ("pathspec: warn on
empty strings as pathspec", 2016-06-22).
> Kevin Daudt writes:
>
>> On Wed, Nov 30, 2016 at 12:31:49PM -0800, Peter Urda wrote:
>>> After upgrading to version 2.11.0 I am getting a wa
On 30/11/16 21:25, Jeff King wrote:
> On Wed, Nov 30, 2016 at 12:40:25PM -0800, Junio C Hamano wrote:
>
>> Ramsay Jones writes:
>>
>>> [I have fixed my config.mak file now, so I don't see the warning
>>> anymore! Having -Wno-format-zero-length in DEVELOPER_CFLAGS, or
>>> not, is a separate matt
Christian Couder writes:
> For now there should be one odb ref per blob. Each ref name should be
> refs/odbs// where is the sha1 of the blob stored
> in the external odb named .
>
> These odb refs should all point to a blob that should be stored in the
> Git repository and contain information ab
Stefan Beller writes:
> On Wed, Nov 30, 2016 at 1:39 PM, Junio C Hamano wrote:
>> Stefan Beller writes:
>>
>>> git relocate-git-dir (--into-workingtree|--into-gitdir) \
>>
>> I am not sure if you meant this as a submodule-specific subcommand
>> or more general helper. "into-workingtree" su
This cgi will be used to upload objects to, or to delete
objects from, an apache web server.
This way the apache server can work as an external object
database.
Signed-off-by: Christian Couder
---
t/lib-httpd.sh| 1 +
t/lib-httpd/upload.sh | 45 +
From: Jeff King
---
external-odb.c | 14 ++
external-odb.h | 6 ++
odb-helper.c | 15 +++
odb-helper.h | 4
4 files changed, 39 insertions(+)
diff --git a/external-odb.c b/external-odb.c
index 1ccfa99a01..42978a3298 100644
--- a/external-odb.c
+++ b/extern
Kevin Daudt writes:
> On Wed, Nov 30, 2016 at 12:31:49PM -0800, Peter Urda wrote:
>> After upgrading to version 2.11.0 I am getting a warning about empty
>> strings as pathspecs while using 'patch'
>>
>> - Ran 'git add -p .' from the root of my git repository.
>>
>> - I was able to normally sta
Signed-off-by: Christian Couder
---
external-odb.c | 4
1 file changed, 4 insertions(+)
diff --git a/external-odb.c b/external-odb.c
index bb70fe3298..6dd7b2548b 100644
--- a/external-odb.c
+++ b/external-odb.c
@@ -133,6 +133,10 @@ int external_odb_write_object(const void *buf, unsigned
lo
This makes it possible to start an apache web server with different
config files.
This will be used in a later patch to pass a config file that makes
apache store external objects.
Signed-off-by: Christian Couder
---
t/lib-httpd.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
di
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 2b016173a0..fe85413725 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -10,9 +10,7 @@ wr
This cgi script can list Git objects that have been uploaded as
files to an apache web server. This script can also retrieve
the content of each of these files.
This will help make apache work as an external object database.
Signed-off-by: Christian Couder
---
t/lib-httpd.sh | 1 +
t/lib-
Signed-off-by: Christian Couder
---
t/t0410-transfer-e-odb.sh | 136 ++
1 file changed, 136 insertions(+)
create mode 100755 t/t0410-transfer-e-odb.sh
diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh
new file mode 100755
index 00
Signed-off-by: Christian Couder
---
cache.h| 9 +
environment.c | 4
external-odb.c | 6 ++
sha1_file.c| 3 +++
4 files changed, 22 insertions(+)
diff --git a/cache.h b/cache.h
index b419b9b7ce..503b618a1f 100644
--- a/cache.h
+++ b/cache.h
@@ -422,6 +422,7 @@ stati
On Wed, Nov 30, 2016 at 1:39 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> git relocate-git-dir (--into-workingtree|--into-gitdir) \
>
> I am not sure if you meant this as a submodule-specific subcommand
> or more general helper. "into-workingtree" suggests to me that it
> is submod
I'm in the process of moving an entire collection of cvs modules into git.
I'm working in Mac Yosemite. Everything is working fine except for one
thing. A couple of the CVS modules have spaces in the paths. Below is what
my command line looks like. When the path has spaces I've tried putting it
in
Stefan Beller writes:
> git relocate-git-dir (--into-workingtree|--into-gitdir) \
I am not sure if you meant this as a submodule-specific subcommand
or more general helper. "into-workingtree" suggests to me that it
is submodule specific, so I'll base my response on that assumption.
Would t
Nguyễn Thái Ngọc Duy writes:
> This option makes sorting ignore case, which is great when you have
> branches named bug-12-do-something, Bug-12-do-some-more and
> BUG-12-do-what and want to group them together. Sorting externally may
> not be an option because we lose coloring and column layout
On Wed, Nov 30, 2016 at 12:31:49PM -0800, Peter Urda wrote:
> After upgrading to version 2.11.0 I am getting a warning about empty
> strings as pathspecs while using 'patch'
>
> - Ran 'git add -p .' from the root of my git repository.
>
> - I was able to normally stage my changes, but was present
On Wed, Nov 30, 2016 at 12:40:25PM -0800, Junio C Hamano wrote:
> Ramsay Jones writes:
>
> > [I have fixed my config.mak file now, so I don't see the warning
> > anymore! Having -Wno-format-zero-length in DEVELOPER_CFLAGS, or
> > not, is a separate matter.]
>
> I suspect that 658df95a4a ("add D
This adds a configuration option odb..plainObjects and the
corresponding boolean variable called 'store_plain_objects' in
'struct odb_helper' to make it possible for external object
databases to store object as plain objects instead of Git objects.
The existing odb_helper_fetch_object() is renamed
From: Jeff King
Signed-off-by: Christian Couder
---
Makefile| 2 +
cache.h | 9 ++
external-odb.c | 115 +++
external-odb.h | 8 ++
odb-helper.c| 239
odb-hel
This is an apache config file to test external object databases.
It uses the upload.sh and list.sh cgi that have been added
previously to make apache store external objects.
Signed-off-by: Christian Couder
---
t/lib-httpd/apache-e-odb.conf | 214 ++
1 file
This tests that an apache web server can be used as an
external object database and store files in their native
format instead of converting them to a Git object.
Signed-off-by: Christian Couder
---
t/t0420-transfer-http-e-odb.sh | 118 +
1 file changed, 1
Signed-off-by: Christian Couder
---
external-odb.c | 15 +++
external-odb.h | 2 ++
odb-helper.c | 41 +
odb-helper.h | 3 +++
sha1_file.c| 2 ++
5 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/external-odb.c b/externa
Goal
Git can store its objects only in the form of loose objects in
separate files or packed objects in a pack file.
To be able to better handle some kind of objects, for example big
blobs, it would be nice if Git could store its objects in other object
databases (ODB).
To do that, this pat
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 0f1bb97f38..6c6da5cf4f 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -57,4 +57,13 @@ test_expect
Hello,
A donation has been made out to you and your family from my foundation.
For details, send an E-mail now to: castrat...@gmail.com
Regards
Duy Nguyen writes:
> On Wed, Nov 23, 2016 at 2:22 AM, Stefan Beller wrote:
>> +/*
>> + * Migrate the given submodule (and all its submodules recursively) from
>> + * having its git directory within the working tree to the git dir nested
>> + * in its superprojects git dir under modules/.
>> + */
On Wed, Nov 30, 2016 at 10:04 AM, Stefan Beller wrote:
>> Submodules and worktrees seem to have many things in common.
>
> Yes. :)
I moved the code to dir.{c,h} and renamed it to a more generic "move_gitdir",
but then I am thinking further about how to align worktrees and submodules here,
specif
On Wed, Nov 30, 2016 at 12:51 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Wed, Nov 23, 2016 at 2:22 AM, Stefan Beller wrote:
>>> +/*
>>> + * Migrate the given submodule (and all its submodules recursively) from
>>> + * having its git directory within the working tree to the git dir ne
Ramsay Jones writes:
> [I have fixed my config.mak file now, so I don't see the warning
> anymore! Having -Wno-format-zero-length in DEVELOPER_CFLAGS, or
> not, is a separate matter.]
I suspect that 658df95a4a ("add DEVELOPER makefile knob to check for
acknowledged warnings", 2016-02-25) took it
After upgrading to version 2.11.0 I am getting a warning about empty
strings as pathspecs while using 'patch'
- Ran 'git add -p .' from the root of my git repository.
- I was able to normally stage my changes, but was presented with a
"warning: empty strings as pathspecs will be made invalid in u
On 30/11/16 11:07, Johannes Schindelin wrote:
> Hi Ramsay,
>
> On Tue, 29 Nov 2016, Ramsay Jones wrote:
>> Also, due to a problem in my config.mak file on Linux (a commented
>> out line that had a line continuation '\', gr!), gcc issued a
>> warning, thus:
>>
>> builtin/difftool.c: In func
On 11/29, Jeff King wrote:
> On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote:
>
> > 2. Grep threads doing more complicated stuff that needs to take a
> > lock. You might try building with -fsanitize=thread to see if it
> > turns up anything.
>
> I tried this and it didn't fi
On Wed, Nov 30, 2016 at 2:06 PM, Jeff King wrote:
>
> I'm not sure what your script does exactly, but in general I think the
> right thing for most scripts is _not_ to use a specific-file option
> like --global.
>
> If the script is looking up a config value on behalf of a user, it
> probably make
On Wed, Nov 30, 2016 at 01:54:35PM -0500, Eli Barzilay wrote:
> I don't have any strong opinion, but FWIW, the use case I have for this
> is as follows: I sync my ~/.gitconfig between my own machine and a work
> machine. On the work machine though, I like people to have work emails,
> and I wrote
On Tue, Nov 29, 2016 at 4:50 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> I think it's arguable whether "--global" should behave the same.
>
> I know you know this and I am writing this message for others.
>
> I admit that I wondered if "a single file" ought to cover these
> short-hand nota
Jakub Narębski writes:
>> My original "create a file in libexec/git-core/" was simple, did the job
>> reliably, and worked also for testing.
>>
>> It is a pity that you two gentlemen shot it down for being inelegant. And
>> ever since, we try to find a solution that is as simple, works as
>> rel
On Wed, Nov 30, 2016 at 3:14 AM, Duy Nguyen wrote:
> On Wed, Nov 23, 2016 at 2:22 AM, Stefan Beller wrote:
>> +/*
>> + * Migrate the given submodule (and all its submodules recursively) from
>> + * having its git directory within the working tree to the git dir nested
>> + * in its superprojects
From: Torsten Bögershausen
Working with a repo that used to be all CRLF. At some point it
was changed to all LF, with `text=auto` in .gitattributes.
Trying to cherry-pick a commit from before the switchover fails:
$ git cherry-pick -Xrenormalize
fatal: CRLF would be replaced by LF in [path]
Hello,
W dniu 28.11.2016 o 18:34, Johannes Schindelin pisze:
> My original "create a file in libexec/git-core/" was simple, did the job
> reliably, and worked also for testing.
>
> It is a pity that you two gentlemen shot it down for being inelegant. And
> ever since, we try to find a solution t
On Wed, Nov 30, 2016 at 01:30:47PM +0100, Johannes Schindelin wrote:
> On Tue, 29 Nov 2016, Jeff King wrote:
>
> > On Tue, Nov 29, 2016 at 09:36:55PM +0100, Johannes Schindelin wrote:
> >
> > > So the suggestion by both you and Peff, to use an environment variable,
> > > which is either global,
This option makes sorting ignore case, which is great when you have
branches named bug-12-do-something, Bug-12-do-some-more and
BUG-12-do-what and want to group them together. Sorting externally may
not be an option because we lose coloring and column layout from
git-branch and git-tag.
The same c
Hi Junio,
On Tue, 29 Nov 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > So the suggestion by both you and Peff, to use an environment variable,
> > which is either global, or requires the user to set it manually per
> > session, is simply not a good idea at all.
>
> As I alrea
Hi Peff,
On Tue, 29 Nov 2016, Jeff King wrote:
> On Tue, Nov 29, 2016 at 09:36:55PM +0100, Johannes Schindelin wrote:
>
> > So the suggestion by both you and Peff, to use an environment variable,
> > which is either global, or requires the user to set it manually per
> > session, is simply not a
On Wed, Nov 23, 2016 at 2:22 AM, Stefan Beller wrote:
> +/*
> + * Migrate the given submodule (and all its submodules recursively) from
> + * having its git directory within the working tree to the git dir nested
> + * in its superprojects git dir under modules/.
> + */
> +void migrate_submodule_g
Hi Ramsay,
On Tue, 29 Nov 2016, Ramsay Jones wrote:
> If you need to re-roll your 'js/difftool-builtin' branch, could
> you please squash this into the relevant patch.
Fixed. Thanks!
> Also, due to a problem in my config.mak file on Linux (a commented
> out line that had a line continuation '\'
93 matches
Mail list logo
