An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.
Signed-off-by: Jiang Xin
---
This patch is based on master branch of git://github.com/git-l10n/git-po
po/de.po| 18 +---
A release candidate Git v2.3.0-rc1 is now available for testing
at the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the 'v2.3.0-rc1'
tag and the 'master' branch that the tag points at:
ur
On Tue, Jan 20, 2015 at 5:20 PM, Stefan Beller wrote:
> Test if we can do arbitrary large transactions. Currently this is a known
> bug that we cannot do large transactions, so document it at least in the
> test suite.
>
> Signed-off-by: Stefan Beller
> ---
> t/t1400-update-ref.sh | 27 +
Test if we can do arbitrary large transactions. Currently this is a known
bug that we cannot do large transactions, so document it at least in the
test suite.
Signed-off-by: Stefan Beller
---
t/t1400-update-ref.sh | 27 +++
1 file changed, 27 insertions(+)
diff --git a/t
Jeff King writes:
>> Thanks; somebody should have caught this before we applied and
>> merged to 'master', but the process obviously did not work well.
>
> I am not too surprised. The use of numeric values for colors was
> completely undocumented, and we did not have any test coverage for it. I
>
Alexander Kuleshov writes:
> There are a couple of source code files as abspath.c, lockfile.c and etc...,
> which defines MAXDEPTH macro. All of these definitions are the same,...
Are they the same by design (because there are logical linkage
between these values and there is a reason why they m
"Dan Langille (dalangil)" writes:
> I did not test this patch. Is that holding up a commit?
I am hoping that you rebuilt the Git you use with this patch by the
time you wrote the message I am responding to and have been using it
for your daily Git needs ;-)
I believe it is queued on the 'next'
Ralf Thielow writes:
> Noticed-by: Jean-Noël Avila
> Signed-off-by: Ralf Thielow
> ---
> Jiang Xin wrote:
>> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA :
>> Yes, it's wrong to using mixed tabs and spaces in the message. It comes
>> from commit v2.0.5-5-g9990273, and it should be fixed.
>
> Thi
On Tue, Jan 20, 2015 at 03:57:13PM -0800, Junio C Hamano wrote:
> > -- >8 --
> > When commit 695d95d refactored the color parsing, it missed
> > a "return 0" when parsing literal numbers 0-8 (which
> > represent basic ANSI colors), leading us to report these
> > colors as an error.
> >
> > Signed-
Jeff King writes:
> Eek. Definitely an unintended regression. The fix is below. Thanks for
> reporting (and especially for catching during the -rc period!).
>
> You should not need it, but for reference, using "0" is the same as
> "black" (both in old git and new).
>
> -- >8 --
> When commit 695d
On Tue, Jan 20, 2015 at 04:49:53PM -0500, Jeff King wrote:
> On Mon, Jan 19, 2015 at 05:17:25PM -0800, Josh Triplett wrote:
>
> > > Can you be a bit more specific about the type count that you are after?
> > > "git describe" counts commits since the most recent tag (possibly within
> > > a specifi
Den 20.01.2015 23:18, skrev Nico Williams:
On Tue, Jan 20, 2015 at 10:38:40PM +0100, Noralf Trønnes wrote:
Yes:
$ echo Noralf Trønnes | xxd
000: 4e6f 7261 6c66 2054 72f8 6e6e 6573 0aNoralf Tr.nnes.
Is there a command I can run that shows that I'm using ISO-8859-1 ?
I need something to g
On Tue, Jan 20, 2015 at 10:38:40PM +0100, Noralf Trønnes wrote:
> Yes:
> $ echo Noralf Trønnes | xxd
> 000: 4e6f 7261 6c66 2054 72f8 6e6e 6573 0aNoralf Tr.nnes.
>
> Is there a command I can run that shows that I'm using ISO-8859-1 ?
> I need something to google with, my previous search onl
On Tue, Jan 20, 2015 at 10:49:32PM +0100, Ævar Arnfjörð Bjarmason wrote:
> I've had this in my .gitconfig since 2010 which was broken by Jeff's
> v2.1.3-24-g695d95d:
>
> ;; Don't be so invasive about coloring ^M when I'm editing files
> that
> ;; are supposed to have \r\n.
> [color "d
On Tue, Jan 20, 2015 at 10:38 PM, Noralf Trønnes wrote:
> Den 20.01.2015 22:26, skrev Ævar Arnfjörð Bjarmason:
>
>> On Tue, Jan 20, 2015 at 10:23 PM, Noralf Trønnes
>> wrote:
>>>
>>> Den 20.01.2015 21:45, skrev Ævar Arnfjörð Bjarmason:
>>>
On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes
>>>
On Mon, Jan 19, 2015 at 05:17:25PM -0800, Josh Triplett wrote:
> > Can you be a bit more specific about the type count that you are after?
> > "git describe" counts commits since the most recent tag (possibly within
> > a specific subset of all tags). Is that your desired format?
>
> That might w
On Tue, Jan 13, 2015 at 12:57 AM, Junio C Hamano wrote:
> An early preview release Git v2.3.0-rc0 is now available for
> testing at the usual places.
[...]
> Jeff King (38):
[...]
> parse_color: refactor color storage
[...]
I've had this in my .gitconfig since 2010 which was broken by Jeff'
Den 20.01.2015 22:26, skrev Ævar Arnfjörð Bjarmason:
On Tue, Jan 20, 2015 at 10:23 PM, Noralf Trønnes wrote:
Den 20.01.2015 21:45, skrev Ævar Arnfjörð Bjarmason:
On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes wrote:
Den 20.01.2015 21:07, skrev Torsten Bögershausen:
On 2015-01-20 20.46, No
On Tue, Jan 20, 2015 at 10:20 PM, Jeff King wrote:
> On Tue, Jan 20, 2015 at 09:45:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> What's happened here is that:
>>
>> 1. You've authored your commit in ISO-8859-1
>> 2. Git itself has no place for the encoding of the author name in the
>> commit o
On Tue, Jan 20, 2015 at 10:23 PM, Noralf Trønnes wrote:
> Den 20.01.2015 21:45, skrev Ævar Arnfjörð Bjarmason:
>
>> On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes wrote:
>>>
>>> Den 20.01.2015 21:07, skrev Torsten Bögershausen:
On 2015-01-20 20.46, Noralf Trønnes wrote:
could it b
Den 20.01.2015 21:45, skrev Ævar Arnfjörð Bjarmason:
On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes wrote:
Den 20.01.2015 21:07, skrev Torsten Bögershausen:
On 2015-01-20 20.46, Noralf Trønnes wrote:
could it be that your "ø" is not encoded as UTF-8,
but in ISO-8859-15 (or so)
$ git log -1
Am 19.01.2015 um 21:19 schrieb Maximilian Held:
I have a directory with nested submodules, such as:
supermodule/submodule/sub-submodule/sub-sub-submodule
When I cd to supermodule and do:
"git push --recurse-submodule=check" (or on-demand),
git only pushes the submodule, but not the sub-submod
On Tue, Jan 20, 2015 at 09:45:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
> What's happened here is that:
>
> 1. You've authored your commit in ISO-8859-1
> 2. Git itself has no place for the encoding of the author name in the
> commit object format
Is (2) right? The "encoding" header in a comm
On Tue, Jan 20, 2015 at 09:45:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes wrote:
> > Den 20.01.2015 21:07, skrev Torsten Bögershausen:
> >>
> >> On 2015-01-20 20.46, Noralf Trønnes wrote:
> >> could it be that your "ø" is not encoded as UTF-8,
> >>
On Tue, Jan 20, 2015 at 9:17 PM, Noralf Trønnes wrote:
> Den 20.01.2015 21:07, skrev Torsten Bögershausen:
>>
>> On 2015-01-20 20.46, Noralf Trønnes wrote:
>> could it be that your "ø" is not encoded as UTF-8,
>> but in ISO-8859-15 (or so)
>>
>>> $ git log -1
>>> commit b2a4f6abdb097c4dc092b56995a
Den 20.01.2015 21:07, skrev Torsten Bögershausen:
On 2015-01-20 20.46, Noralf Trønnes wrote:
could it be that your "ø" is not encoded as UTF-8,
but in ISO-8859-15 (or so)
$ git log -1
commit b2a4f6abdb097c4dc092b56995a2af8e42fbea79
Author: Noralf Trnnes
What does
git config -l | grep Noralf |
On 2015-01-20 20.46, Noralf Trønnes wrote:
could it be that your "ø" is not encoded as UTF-8,
but in ISO-8859-15 (or so)
> $ git log -1
> commit b2a4f6abdb097c4dc092b56995a2af8e42fbea79
> Author: Noralf Trnnes
What does
git config -l | grep Noralf | xxd
say ?
--
To unsubscribe from this list: s
I can't get my name: Noralf Trønnes, to come out correctly when I
format and send a patch. The 'ø' becomes a question mark when received
in my email client.
This is the head of the patch file generated by git format-patch:
From b2a4f6abdb097c4dc092b56995a2af8e42fbea79 Mon Sep 17 00:00:00 2001
Fr
Noticed-by: Jean-Noël Avila
Signed-off-by: Ralf Thielow
---
Jiang Xin wrote:
> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA :
> Yes, it's wrong to using mixed tabs and spaces in the message. It comes
> from commit v2.0.5-5-g9990273, and it should be fixed.
This also breaks the indentation of the
On 2015-01-20 14.03, Nguyễn Thái Ngọc Duy wrote:
> Sorry for this really late update. This fixes bugs in extension
> writing code (10/24), support using the same cache from different
> hosts (23/24), and adds a new bug to point the user to untracked cache from
> 'git status -uno' (new patch 24/24)
> --- a/cache.h
> +++ b/cache.h
> @@ -1010,6 +1010,7 @@ extern int read_ref(const char *refname, unsigned char
> *sha1);
> * Caps and underscores refers to the special refs, such as HEAD,
> * FETCH_HEAD and friends, that all live outside of the refs/ directory.
> */
What happened to the com
The bash completion provided with git doesn't escape or quote parens
in tag or branch names.
Alternatively, it doesn't reject branch or tag names with parenthesis
as an invalid name (as it does for names with spaces or tabs)
Bash treats parentheses in unquoted words as a word separator.
When encou
Signed-off-by: Alexander Kuleshov
---
builtin/hash-object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 207b90c..a8100a7 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -80,7 +80,7 @@ int cmd_hash_object
There are a couple of source code files as abspath.c, lockfile.c and etc...,
which defines MAXDEPTH macro. All of these definitions are the same, so let's
move MAXDEPTH definition to the instead of directly declaration of
this macro in all these files.
Signed-off-by: Alexander Kuleshov
---
absp
I did not test this patch. Is that holding up a commit?
—
Dan Langille
Infrastructure & Operations
Talos Group
Sourcefire, Inc.
> On Jan 7, 2015, at 7:29 PM, brian m. carlson
> wrote:
>
> Apache servers using mod_auth_kerb can be configured to allow the user
> to authenticate either using Neg
陶鈴立ixccbew05qzz
全新第四代金善美有效提升代謝，
還妳窈宨曲線，享受28腰真的不難。
『BODY雜誌金纖獎』專家評鑑超人氣口碑，
絕對有信心，天然配方安全無慮，超強力提升基礎代謝。
金善美官方網站 http://ow.ly/HpafR
acezm陶鈴立
--
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 h
When a good user sees the "too long, consider -uno" advice when
running `git status`, they should check out the man page to find out
more. This change suggests they try untracked cache before -uno.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/git-status.txt | 5 -
1 file changed, 4
Ideally we should implement untracked_cache_remove_from_index() and
untracked_cache_add_to_index() so that they update untracked cache
right away instead of invalidating it and wait for read_directory()
next time to deal with it. But that may need some more work in
unpack-trees.c. So stay simple as
If the user enables untracked cache, then
- move worktree to an unsupported filesystem
- or simply upgrade OS
- or move the whole (portable) disk from one machine to another
- or access a shared fs from another machine
there's no guarantee that untracked cache can still function properly.
Rec
This could be used to verify correct behavior in tests
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
dir.c | 12
1 file changed, 12 insertions(+)
diff --git a/dir.c b/dir.c
index 439ff22..c5ca5ce 100644
--- a/dir.c
+++ b/dir.c
@@ -1922,6 +1922,18 @@ int rea
When a directory is updated within the same second that its timestamp
is last saved, we cannot realize the directory has been updated by
checking timestamps. Assume the worst (something is update). See
29e4d36 (Racy GIT - 2005-12-20) for more information.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signe
Overall time saving on "git status" is about 40% in the best case
scenario, removing ..collect_untracked() as the most time consuming
function. read and refresh index operations are now at the top (which
should drop when index-helper and/or watchman support is added). More
numbers and analysis belo
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
cache.h | 1 +
dir.c| 9 +
read-cache.c | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h
index f8b3dc5..fca979b 100644
--- a/cache.h
+++ b/cache.h
@@ -295,6 +295,7 @
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
read-cache.c | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index d643a3f..f12a185 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -270,20 +270,26 @@ s
Helped-by: Eric Sunshine
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
compat/mingw.c | 11 +++
compat/mingw.h | 9 +
2 files changed, 20 insertions(+)
diff --git a/compat/mingw.c b/compat/mingw.c
index c5c37e5..88140e4 100644
--- a/compat/mingw.c
+++ b
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
.gitignore | 1 +
Makefile | 1 +
t/t7063-status-untracked-cache.sh (new +x) | 353 +
test-dump-untracked-cache.c (new)
Helped-by: Eric Sunshine
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
Documentation/git-update-index.txt | 6 ++
builtin/update-index.c | 148 +
2 files changed, 154 insertions(+)
diff --git a/Documentation/git-update-i
This can be used to double check if results with untracked cache are
correctly, compared to vanilla version. Untracked cache remains in
index, but not used.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --
update_index_if_able() is moved down so that the updated untracked
cache could be written out.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
builtin/commit.c | 5 +++--
wt-status.c | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/commit
If we redo this thing in a functional style, we would have one struct
untracked_dir as input tree and another as output. The input is used
for verification. The output is a brand new tree, reflecting current
worktree.
But that means recreate a lot of dir nodes even if a lot could be
shared between
Signed-off-by: Nguyễn Thái Ngọc Duy
---
dir.c| 220 +++
dir.h| 2 +
read-cache.c | 5 ++
3 files changed, 227 insertions(+)
diff --git a/dir.c b/dir.c
index 1f2d701..e7d7df3 100644
--- a/dir.c
+++ b/dir.c
@@ -2275,3 +227
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
ewah/ewah_io.c | 13 +
ewah/ewok.h| 2 ++
split-index.c | 11 ++-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c
index 1c2d7af..43481b9 100644
--- a/ew
The main readdir loop in read_directory_recursive() is replaced with a
new one that checks if cached results of a directory is still valid.
If a file is added or removed from the index, the containing directory
is invalidated (but not its subdirs). If directory's mtime is changed,
the same happens
This cuts down a signficant number of open(.gitignore) because most
directories usually don't have .gitignore files.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
dir.c | 26 +-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/dir.c b
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/technical/index-format.txt | 58 +
cache.h | 3 +
dir.c| 136 +++
dir.h| 1 +
read-cache.c
It's easy to see that if an existing .gitignore changes, its SHA-1
would be different and invalidate_gitignore() is called.
If .gitignore is removed, add_excludes() will treat it like an empty
.gitignore, which again should invalidate the cached directory data.
if .gitignore is added, lookup_untr
This allows us to feed different info to read_directory_recursive()
based on untracked cache in the next patch.
Helped-by: Ramsay Jones
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
dir.c | 55 +++
1 file changed, 47 i
Make sure the starting conditions and all global exclude files are
good to go. If not, either disable untracked cache completely, or wipe
out the cache and start fresh.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Junio C Hamano
---
dir.c | 113
This is not used anywhere yet. But the goal is to compare quickly if a
.gitignore file has changed when we have the SHA-1 of both old (cached
somewhere) and new (from index or a tree) versions.
Helped-by: Junio C Hamano
Helped-by: Torsten Bögershausen
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-
The idea is if we can capture all input and (non-rescursive) output of
read_directory_recursive(), and can verify later that all the input is
the same, then the second r_d_r() should produce the same output as in
the first run.
The requirement for this to work is stat info of a directory MUST
chan
Sorry for this really late update. This fixes bugs in extension
writing code (10/24), support using the same cache from different
hosts (23/24), and adds a new bug to point the user to untracked cache from
'git status -uno' (new patch 24/24)
Diff from 'pu'
-- 8< --
diff --git a/Documentation/git-s
Hi!
git-arr is a git repository browser that can generate static HTML
instead of having to run dynamically.
I've just released version 0.14, which includes minor fixes and
performance improvements, as well as the following features:
- Improved max_pages handling, including saner defaults.
- S
I have tried to fix this before: see 568950388be2, but it doesn't
really work.
I don't know how it happend, but that commit makes interactive rebase to
respect core.abbrev only during --edit-todo, but not the initial todo
list edit.
For this time I've included a test-case to avoid this frustratio
63 matches
Mail list logo
