Hi Junio,
On Tue, 26 Jan 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Johannes Schindelin writes:
> >
> >> +static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m)
> >> +{
> >> + int needs_cr;
> >> +
> >> + /* Match post-images' preceding, or first, lines' end-of-li
Jeff King venit, vidit, dixit 27.01.2016 08:33:
> On Wed, Jan 27, 2016 at 08:23:02AM +0100, Michael J Gruber wrote:
>
>>> Tag objects already have a "tag" header, which is part of the signed
>>> content. If you use "git verify-tag -v", you can check both that the
>>> signature is valid and that th
On Wed, Jan 27, 2016 at 08:23:02AM +0100, Michael J Gruber wrote:
> > Tag objects already have a "tag" header, which is part of the signed
> > content. If you use "git verify-tag -v", you can check both that the
> > signature is valid and that the tag is the one you are expecting.
>
> Yes, that's
Hi Carl,
On Wed, 27 Jan 2016, Sulzberger, Carl wrote:
> Does Git support being installing on Windows Server 2008 R2 or Server
> 2012 R2 platforms as it does not list what is supported at download it
> just says Windows.
In general, we try to support every Windows version that is not past its
end
Jeff King venit, vidit, dixit 26.01.2016 21:26:
> On Tue, Jan 26, 2016 at 10:29:42AM -0500, Santiago Torres wrote:
>
>>> If you cannot trust those with write access to a repo that you are
>>> pulling and installing from you might want to re-check where you are
>>> pulling or installing from ;)
>>
When we know that mtime on directory as given by the environment
is usable for the purpose of untracked cache, we may want the
untracked cache to be always used without any mtime test or
kernel name check being performed.
Also when we know that mtime is not usable for the purpose of
untracked cach
Signed-off-by: Christian Couder
---
t/t7063-status-untracked-cache.sh | 85 +--
1 file changed, 81 insertions(+), 4 deletions(-)
diff --git a/t/t7063-status-untracked-cache.sh
b/t/t7063-status-untracked-cache.sh
index 253160a..a971884 100755
--- a/t/t7063-sta
To correctly perform its testing function,
test-dump-untracked-cache should not change the state of the
untracked cache in the index.
As a previous patch makes read_index_from() change the state of
the untracked cache and as test-dump-untracked-cache indirectly
calls this function, we need a mecha
It is not a good idea to compare kernel versions and disable
the untracked cache if it changes, as people may upgrade and
still want the untracked cache to work. So let's just
compare work tree locations and kernel name to decide if we
should disable it.
Also storing many locations in the ident fi
Attempting to flip the untracked-cache feature on for a random index
file with
cd /random/unrelated/place
git --git-dir=/somewhere/else/.git update-index --untracked-cache
would not work as you might expect. Because flipping the feature on
in the index also records the location of the cor
Helped-by: Duy Nguyen
Signed-off-by: Christian Couder
---
builtin/update-index.c | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index a6fff87..1e546a3 100644
--- a/builtin/update-index.c
+++ b/builtin/update
Factor out code into new_untracked_cache() and
add_untracked_cache(), which will be used
in later commits.
Helped-by: Eric Sunshine
Signed-off-by: Christian Couder
---
builtin/update-index.c | 11 +--
dir.c | 18 ++
dir.h | 1 +
3 files
Signed-off-by: Christian Couder
---
builtin/update-index.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 369c207..fe7aaa3 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1116,8 +1116,6 @@ int cmd_u
Factor out code into remove_untracked_cache(), which will be used
in a later commit.
Signed-off-by: Christian Couder
---
builtin/update-index.c | 6 +-
dir.c | 9 +
dir.h | 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/builtin/
Junio C Hamano wrote:
> Eric Wong writes:
>
> > Hi Junio, have you taken a look at:
> > http://mid.gmane.org/20160116101719.ga21...@dcvr.yhbt.net ?
> > ("git-svn: fix auth parameter handling on SVN 1.9.0+")
>
> Yes, I did, and I also did notice that you said it should head to
> maint. I was
It is nice to just be able to test if untracked cache is
supported without enabling it.
Helped-by: David Turner
Signed-off-by: Christian Couder
---
Documentation/git-update-index.txt | 12 +++-
builtin/update-index.c | 5 +
2 files changed, 16 insertions(+), 1 deletion(
Signed-off-by: Christian Couder
---
builtin/update-index.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 7431938..a6fff87 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1123,6 +1123,7 @@ int cmd_update_index(int arg
Here is a new version of a patch series to improve the untracked cache
feature.
This v8 implements core.untrackedCache as a tristate config
variable. When it's `true`, Git commands, especially `git status`,
should always add the untracked cache and use it, and when `false`,
Git commands should rem
The only code that cares about the value of the global variable
saved_env_before_alias after the previous fix is handle_builtin()
that turns into a glorified no-op when the variable is true, so the
logic could safely be lifted to its caller, i.e. the caller can
refrain from calling it when the vari
We made sure that save_env_before_alias() does not skip saving the
environment when asked to (which led to double free of orig_cwd in
restore_env()) with the previous step. Protect against future
breakage where somebody adds new callers of these functions in an
unbalanced fashion.
Signed-off-by:
Junio C Hamano writes:
> I spoke too soon, I am afraid.
> ...
> I wonder if this would be better done as a multi-part series that
> goes like this:
> ...
So here is the first of the three-patch series to replace it.
-- >8 --
From: Junio C Hamano
Date: Tue, 26 Jan 2016 11:46:53 -0800
Subject: [
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> When a filter is configured, a different code-path is used in
> convert.c and entry.c via get_stream_filter(), but there are no test cases
> yet.
>
> Add tests for the filter API by configuring the ident filter.
> The result of the SHA1 conv
Eric Wong writes:
> Hi Junio, have you taken a look at:
> http://mid.gmane.org/20160116101719.ga21...@dcvr.yhbt.net ?
> ("git-svn: fix auth parameter handling on SVN 1.9.0+")
Yes, I did, and I also did notice that you said it should head to
maint. I was meaning to ask you if you were going t
Hi Junio, have you taken a look at:
http://mid.gmane.org/20160116101719.ga21...@dcvr.yhbt.net ?
("git-svn: fix auth parameter handling on SVN 1.9.0+")
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo i
Junio C Hamano wrote:
> I am not sure if it is a good idea to show */*/* as an example in
> the message (that is an anti-example of 'one set of wildcard' by
> having three stars, isn't it?), but that is not a new issue this
> change introduces.
Actually, going back to commit 570d35c26dfbc40757da6
Hi,
Does Git support being installing on Windows Server 2008 R2 or Server 2012 R2
platforms as it does not list what is supported at download it just says
Windows.
I've gone through the progit-en.998.pdf and looked all over the website.
Kind regards
Carl Sulzberger
(IT Systems Administrator)
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of 'master' now has a few
Lars Schneider writes:
> Hi Junio,
>
> Did you miss the topic "submodule: extend die message on failed
> checkout with depth argument" or do you not agree with it
> ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666
> and $gmane/283851).
No, these three are still in my inbox.
Qu
Jeff King writes:
>> I don't think that an addition like this would get in the way of any
>> existing git workflow, and should be backwards-compatible right?
>
> Doesn't this already exist?
>
> $ git cat-file tag v2.0.0
> object e156455ea49124c140a67623f22a393db62d5d98
> type commit
> tag
Johannes Schindelin writes:
> This is a big milestone. With these modifications, Git's source code
> does not only build without warnings in Git for Windows' SDK, but
> passes the entire regression test suite.
Thanks.
Without a few fixups, the result of applying these patches made
tests fail fo
Am 24.01.2016 um 16:59 schrieb f...@fuz.su:
Right now, git archive creates a pax global header of the form
comment=57ca140635bf157354124e4e4b3c8e1bde2832f1
in tar archives it creates. This is suboptimal as as comments are
specified to be ignored by extraction software. It is impossible to
Johannes Schindelin writes:
> On Windows, the permission system works completely differently than
> expected by some of the tests. So let's make sure that we do not test
> POSIX functionality on Windows.
>
> This lets t9124-git-svn-dcommit-auto-props.sh pass in Git for Windows'
> SDK.
>
> Signed-
Johannes Schindelin writes:
> In Git for Windows, the MSYS2 POSIX emulation layer used by the Bash
> converts command-line arguments that looks like they refer to a POSIX
> path containing a file list (i.e. @) into a Windows path
> equivalent when calling non-MSYS2 executables, such as git.exe.
>
Johannes Schindelin writes:
> @@ -181,7 +180,8 @@ test_expect_success "$name" '
> name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
> LC_ALL="$GIT_SVN_LC_ALL"
> export LC_ALL
> -test_expect_success UTF8 "$name" "
> +# This test relies on the previous test, hence requires POSIXPERM,SYML
On Tue, Jan 26, 2016 at 12:59 PM, Jens Lehmann wrote:
>>> Ok. Though we might wanna call it submodule.autoUpdate, as initializing
>>> it is only the prerequisite for automatically updating submodules. And
>>> I believe automatically updating is the thing we're after here, right?
>>
>>
>> I am not
On Tue, Jan 26, 2016 at 03:26:51PM -0500, Jeff King wrote:
> On Tue, Jan 26, 2016 at 10:29:42AM -0500, Santiago Torres wrote:
>
> > > If you cannot trust those with write access to a repo that you are
> > > pulling and installing from you might want to re-check where you are
> > > pulling or insta
Junio C Hamano writes:
> Johannes Schindelin writes:
>
>> +static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m)
>> +{
>> +int needs_cr;
>> +
>> +/* Match post-images' preceding, or first, lines' end-of-line style */
>> +needs_cr = is_eol_crlf(&xe1->xdf2, m->i1 ? m->i1
Jeff King writes:
> On Tue, Jan 26, 2016 at 10:29:42AM -0500, Santiago Torres wrote:
>
>> > If you cannot trust those with write access to a repo that you are
>> > pulling and installing from you might want to re-check where you are
>> > pulling or installing from ;)
>>
>> Yeah, I see your point
Am 25.01.2016 um 19:59 schrieb Stefan Beller:
On Sun, Jan 24, 2016 at 11:38 AM, Jens Lehmann wrote:
Am 23.01.2016 um 01:31 schrieb Stefan Beller:
This series introduces labels which you can attach to submodules like so:
$ cat .gitmodules
[submodule "gcc"]
path = gcc
On Tue, Jan 26, 2016 at 10:29:42AM -0500, Santiago Torres wrote:
> > If you cannot trust those with write access to a repo that you are
> > pulling and installing from you might want to re-check where you are
> > pulling or installing from ;)
>
> Yeah, I see your point, but mechanisms to ensure t
Eric Sunshine writes:
>> +if ! test_have_prereq MINGW && touch -- 'tab embedded' 'newline
>> [...]
>> +test_have_prereq !MINGW &&
>
> Where negation is concerned, is there a non-obvious reason that this
> patch sometimes says:
>
> ! test_have_prereq MINGW
>
> and sometimes:
>
> test_hav
Nguyễn Thái Ngọc Duy writes:
> Commit 57ea712 (git.c: make sure we do not leak GIT_* to alias scripts -
> 2015-12-20) does not realize that handle_alias() can be called multiple
> times because of the forever loop in run_argv(). The commit breaks alias
> chains.
>
> Suppose you have an alias "ab
On Tue, Jan 26, 2016 at 9:35 AM, Johannes Schindelin
wrote:
> MSYS2 actually allows to create files or directories whose names contain
> tabs, newlines or colors, even if plain Win32 API cannot access them.
> As we are using an MSYS2 bash to run the tests, such files or
> directories are created s
Nguyễn Thái Ngọc Duy writes:
> diff --git a/git.c b/git.c
> index da278c3..cd733f7 100644
> --- a/git.c
> +++ b/git.c
> @@ -25,14 +25,15 @@ static const char *env_names[] = {
> GIT_PREFIX_ENVIRONMENT
> };
> static char *orig_env[4];
> -static int saved_env_before_alias;
> +static int sav
Thanks, will queue.
--
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
larsxschnei...@gmail.com writes:
> From: Lars Schneider
>
> The Travis-CI machines are in a clean state in the beginning of every run
> (transient by default). Use the Travis-CI cache feature to make the prove
> state persistent across consecutive Travis-CI runs on the same branch.
> This allows
Johannes Schindelin writes:
> +static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m)
> +{
> + int needs_cr;
> +
> + /* Match post-images' preceding, or first, lines' end-of-line style */
> + needs_cr = is_eol_crlf(&xe1->xdf2, m->i1 ? m->i1 - 1 : 0);
> + if (needs_cr)
Michael J Gruber writes:
> Nguyễn Thái Ngọc Duy venit, vidit, dixit 26.01.2016 14:26:
>> Commit 57ea712 (git.c: make sure we do not leak GIT_* to alias scripts -
>> 2015-12-20) does not realize that handle_alias() can be called multiple
>> times because of the forever loop in run_argv(). The comm
Johannes Schindelin writes:
> This is my fault: there are two MINGW prereqs, and they guard against
> trying to work with file names ending in a dot (which is illegal on
> Windows' file systems).
Ahh, I failed to notice that MINGW was protecting against the "dot"
thing. So I was wrong; that one
On Tue, Jan 26, 2016 at 1:04 AM, Johannes Schindelin
wrote:
> Not sure. You might end up with a very long line (containing plenty of LF
> "characters") and the conflict marker *at the end* of said line, with a
> CR/LF after it. I would not call that particularly helpful.
>
> Seeing as we really ca
Hi Ramsay,
On Tue, 26 Jan 2016, Ramsay Jones wrote:
> On 26/01/16 08:54, Johannes Schindelin wrote:
> > Hi Ramsay,
> [snip]
>
> >>
> >> But you are only testing 3/4 conflict markers end in CR/LF. :-D
> >
> > The fact that ||| markers are present is the fault of previous test cases.
> > I tried
On 26/01/16 08:54, Johannes Schindelin wrote:
> Hi Ramsay,
[snip]
>>
>> But you are only testing 3/4 conflict markers end in CR/LF. :-D
>
> The fact that ||| markers are present is the fault of previous test cases.
> I tried to make a point of *not* relying on such a side effect (so as to
> deb
On Tue, Jan 26, 2016 at 10:35:34AM +0100, Michael J Gruber wrote:
> Santiago Torres venit, vidit, dixit 25.01.2016 22:22:
> > Hello everyone.
> >
> > I've done some further research on the security properties of git
> > metadata and I think I've identified something that might be worth
> > discuss
On Windows, Git itself has no clue about POSIX paths, but its shell
scripts do. In this instance, we get mixed paths as a result, and when
comparing the path of the author file, we get a mismatch that is
entirely due to the POSIX path vs Windows path clash.
Let's just skip this test so that t9130-
When merging files with CR/LF line endings, the conflict markers should
match those, lest the output file has mixed line endings.
This is particularly of interest on Windows, where some editors get
*really* confused by mixed line endings.
The original version of this patch by Beat Bolli respected
In the previous patch, we made sure that the conflict markers themselves
match the end-of-line style of the input files. However, this still left
out the conflicting text itself: if it lacks a trailing newline, we
add one, and should add a carriage return when appropriate, too.
Signed-off-by: Joha
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. And they were misguided
to begin with (see below).
Since there have been a couple of "What's
Nguyễn Thái Ngọc Duy venit, vidit, dixit 26.01.2016 14:26:
> Commit 57ea712 (git.c: make sure we do not leak GIT_* to alias scripts -
> 2015-12-20) does not realize that handle_alias() can be called multiple
> times because of the forever loop in run_argv(). The commit breaks alias
> chains.
>
> S
In Git for Windows, the MSYS2 POSIX emulation layer used by the Bash
converts command-line arguments that looks like they refer to a POSIX
path containing a file list (i.e. @) into a Windows path
equivalent when calling non-MSYS2 executables, such as git.exe.
Let's just skip the test that uses the
This solves two problems:
- we now have proper localisation even on Windows
- we sidestep the infamous "BUG: your vsnprintf is broken (returned -1)"
message when running "git init" (which otherwise prevents the entire
test suite from running) because libintl.h overrides vsnprintf() with
lib
It does not quite work because it produces DOS line endings which the
shell does not like at all.
This lets t0200-gettext-basic.sh, t0204-gettext-reencode-sanity.sh,
t3406-rebase-message.sh, t3903-stash.sh, t7400-submodule-basic.sh,
t7401-submodule-summary.sh, t7406-submodule-update.sh and
t7407-s
On Windows, there are no POSIX paths, only Windows ones (an absolute
Windows path looks like "C:\Program Files\Git\ReleaseNotes.html", under
most circumstances, forward slashes are also allowed and synonymous to
backslashes).
So when a POSIX shell (such as MSYS2's Bash, which is used by Git for
Wi
MSYS2 actually allows to create files or directories whose names contain
tabs, newlines or colors, even if plain Win32 API cannot access them.
As we are using an MSYS2 bash to run the tests, such files or
directories are created successfully, but Git itself has no chance to
work with them because i
On Windows, the permission system works completely differently than
expected by some of the tests. So let's make sure that we do not test
POSIX functionality on Windows.
This lets t9124-git-svn-dcommit-auto-props.sh pass in Git for Windows'
SDK.
Signed-off-by: Johannes Schindelin
---
t/t9124-gi
On Windows' file systems, file names with trailing dots are forbidden.
The POSIX emulation layer used by Git for Windows' Subversion emulates
those file names, therefore the test adding the file would actually
succeed, but when we would ask git.exe (which does not leverage the
POSIX emulation layer
On Windows, absolute paths never start with a slash, unless a POSIX
emulation layer is used. The latter is the case for MSYS2's Perl that
Git for Windows leverages. However, in the tests we also go through
plain `git.exe`, which does *not* leverage the POSIX emulation layer,
and therefore the paths
This test assumed that there is only one directory separator (the
forward slash), not two equivalent directory separators.
However, on Windows, the back slash and the forward slash *are*
equivalent.
Let's paper over this issue by converting the backward slashes to
forward ones in the test that fai
From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?=
When the rename() function tries to move a directory it fails if the
target directory exists. It should check if it can delete the (possibly
empty) target directory and then try again to move the directory.
This partially fixes t9100-git-svn-basic.sh
POSIX semantics requires lstat() to fail with ENOTDIR when "[a]
component of the path prefix names an existing file that is neither a
directory nor a symbolic link to a directory".
See http://pubs.opengroup.org/onlinepubs/9699919799/functions/lstat.html
This behavior is expected by t1404-update-r
When shell scripts access a $TMPDIR variable containing backslashes,
they will be mistaken for escape characters. Let's not let that happen
by converting them to forward slashes.
This partially fixes t7800 with MSYS2.
Signed-off-by: Johannes Schindelin
---
compat/mingw.c | 23 ++
From: Karsten Blees
We will add more environment-related code to that new function
in the next patch.
Signed-off-by: Karsten Blees
Signed-off-by: Johannes Schindelin
---
compat/mingw.c | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/compat/
From: Pat Thoyts
The colon is used by check-ignore to separate paths from other output
values. If we use an absolute path, however, on Windows it will be
converted into a Windows path that very much contains a colon.
It is actually not at all necessary to make the path of the global
excludes abs
Since baaf233 (connect: improve check for plink to reduce false
positives, 2015-04-26), t5601 writes out a `plink.exe` for testing that
is actually a shell script. So the assumption that the `.exe` extension
implies that the file is *not* a shell script is now wrong.
Since there was no love for th
In Git for Windows' SDK, the tests are run using a Bash that relies on
the POSIX emulation layer MSYS2 (itself a friendly fork of Cygwin). As
such, paths in tests can be POSIX paths. As soon as those paths are
passed to git.exe (which does *not* use the POSIX emulation layer),
those paths are conve
Many a test requires either POSIXPERM (to change the executable bit) or
SYMLINKS, and neither are available on Windows.
This lets t9100-git-svn-basic.sh pass in Git for Windows' SDK.
Signed-off-by: Johannes Schindelin
---
t/t9100-git-svn-basic.sh | 18 +-
1 file changed, 9 inser
The Git daemon tests create a FIFO first thing and will hang if said
FIFO is not available.
This is a problem with Git for Windows, where `mkfifo` is an MSYS2
program that leverages MSYS2's POSIX emulation layer, but
`git-daemon.exe` is a MINGW program that has not the first clue about
that POSIX
MSYS2 (the POSIX emulation layer used by Git for Windows' Bash) actually
has a working mkfifo. The only problem is that it is only emulating
named pipes through the MSYS2 runtime; The Win32 API has no idea about
named pipes, hence the Git executable cannot access those pipes either.
The symptom is
This is a big milestone. With these modifications, Git's source code
does not only build without warnings in Git for Windows' SDK, but
passes the entire regression test suite.
The patch series contains three different types of patches. First,
there are a couple of real fixes that were triggered by
Hello Sir/Madam
My name is Tessy Richard ,
I will love to get your company details and the price list
of your product , and all i need to know ,
please kindly send me your info (asap)
I will be expecting to hear from you .
Thanks
Mrs, Tessy Richard
mobile:+22899240412
--
To unsubscribe fro
Commit 57ea712 (git.c: make sure we do not leak GIT_* to alias scripts -
2015-12-20) does not realize that handle_alias() can be called multiple
times because of the forever loop in run_argv(). The commit breaks alias
chains.
Suppose you have an alias "abc" that resolves to another alias "def",
wh
From: Knut Franke
Currently, the only way to pass proxy credentials to curl is by including them
in the proxy URL. Usually, this means they will end up on disk unencrypted, one
way or another (by inclusion in ~/.gitconfig, shell profile or history). Since
proxy authentication often uses a domain
From: Knut Franke
CURLAUTH_ANY does not work with proxies which answer unauthenticated requests
with a 307 redirect to an error page instead of a 407 listing supported
authentication methods. Therefore, allow the authentication method to be set
using the environment variable GIT_HTTP_PROXY_AUTHME
On Tue, Jan 26, 2016 at 2:37 PM, Michael J Gruber
wrote:
> Hi there,
>
> with current next (989ee58 plus local additions) it seems that typo
> DWIMery with aliases is broken, see below.
>
> It appears that the typo DWIMery is broken only when there is a unique
> automatic DWIM substitution for a m
($C stands for $GIT_COMMON_DIR for the rest of the message)
In main worktree, we read these config files in this order:
1) system config
2) XDG config
3) user config
4) $GIT_DIR/config
Currently linked worktrees share the same config file at step 4 with
main worktree. The problem is, not all con
This new option allows the user to write to or read from
.git/common/config in worktree v1. In worktree v0, --repo is an alias
of --local.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/git-config.txt | 14 +-
Documentation/git-worktree.txt | 4
Documen
The most obvious use case is, "git worktree add" creates the first
linked worktree. In this case, we should be able to move to latest
worktree version. The following happens:
- common/config is created with extensions.worktree 1 and
core.repositoryformatversion 1
- all config keys except a f
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/gitrepository-layout.txt | 4
path.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/Documentation/gitrepository-layout.txt
b/Documentation/gitrepository-layout.txt
index 577ee84..771e362 100644
---
I've changed my mind. So v3 is not a polished v2. It's quite different.
And I hope it's good different.
In v2, .git/config contains both shared part and the per-worktree part
(for main worktree). It's ugly, slow and hard to work with. v3 adds a
completly new config file for sharing. ".git/config"
Multiple worktree setup is still evolving and its behavior may be
changed in future. But we do not want to break existing worktree
setups. A new set of extensions, worktree=X, is recognized to tell Git
what multiple worktree "version" is being used so that Git can
behavior accordingly.
This extens
Worktree v1 may have different .git file split than v0. Add support
code to change common file list based on extensions.worktree. The list
for now is identical to v0.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
path.c | 40 +---
1 file changed, 37 insertions(+), 3
On Tue, Jan 26, 2016 at 3:19 AM, Eric Sunshine wrote:
> On Tue, Jan 5, 2016 at 3:03 AM, Karthik Nayak wrote:
>> From align_atom_parser() form parse_align_position() which given a
>> string would give us the alignment position. This is a preparatory
>> patch as to introduce prefixes for the %(alig
On Tue, Jan 26, 2016 at 5:58 AM, Eric Sunshine wrote:
> On Tue, Jan 5, 2016 at 3:03 AM, Karthik Nayak wrote:
>> Introduce remote_ref_atom_parser() which will parse the '%(upstream)'
>> and '%(push)' atoms and store information into the 'used_atom'
>> structure based on the modifiers used along wi
From: Lars Schneider
The Travis-CI machines are in a clean state in the beginning of every run
(transient by default). Use the Travis-CI cache feature to make the prove
state persistent across consecutive Travis-CI runs on the same branch.
This allows to run previously failed tests first and run
From: Lars Schneider
Set `sudo: false` to explicitly use the (faster) container-based
infrastructure for the Travis-CI Linux build.
More info:
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
Signed-off-by: Lars Schneider
---
.travis.yml | 2 ++
1 file changed, 2 in
From: Lars Schneider
diff to v1:
- improve the commit message ($gmane/284465)
- rename the Travis cache directory from $HOME/.prove-cache to
$HOME/travis-cache for clarity
- explicitly use container-based infrastructure ($gmane/284432)
Thanks Mike, Jeff, and Junio for the revie
On 21 Jan 2016, at 00:33, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am st
On Tue, Jan 26, 2016 at 5:15 AM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>>> + git for-each-ref --format="|%(align:$option)refname is
>>> %(refname)%(end)|%(refname)" >actual &&
>>
>> This is not wrong, per se, but referencing $option inside the
>> non-interpolating single-
On Tue, Jan 26, 2016 at 10:46 AM, Christian Couder
wrote:
> On Tue, Jan 5, 2016 at 9:03 AM, Karthik Nayak wrote:
>> Introduce optional prefixes "width=" and "position=" for the align atom
>> so that the atom can be used as "%(align:width=,position=)".
>>
>> Add Documetation and tests for the same
Add --all and --include-untracked to the git stash save completions.
Add --quiet to the git stash drop completions.
Update git stash branch so that the first argument expands out to the
possible branch names, and the other arguments expand to the stash
names.
Signed-off-by: Paul Wagland
---
con
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
+
1 - 100 of 108 matches
Mail list logo
