- Ursprungligt meddelande -
Hi Andreas,
Thanks for the reply and no, I could not. However, you put me on the
right track. Since I was only pushing/pulling from Windows to/from my
Linux repository, I did not realize that an SSH session from the
Linux
back to Windows would ever be
The definition of green has changed in Tk 8.6:
- http://wiki.tcl.tk/21276
- http://www.tcl.tk/cgi-bin/tct/tip/403
gitk looks pretty awkward with Tk 8.6. green is simply too dark now
because it has changed from #00FF00 to #008000.
One could also use lime instead of #00FF00 but that would break
This file is rather outdated and IMHO shouldn't be there in the first place.
(If there are translations of the Git documentation they are better be kept
separate from the original documentation.)
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/pt_BR/gittutorial.txt | 675
Currently you can use mailmap to display log authors and committers
but you can't use the mailmap to find commits with mapped values.
This commit allows you to run:
git log --use-mailmap --author mapped_name_or_email
git log --use-mailmap --committer mapped_name_or_email
Of course it
Nicely analysed. Perhaps we would want new test pieces to define
the behaviour we want to see first?
I think we should.
I also thought about the use case of committed and ignored directory
which is also broken to me (point 3 in the table below).
Anyway I tried to make a table to
Peter Hofmann git-...@uninformativ.de writes:
Subject: Re: [PATCH] gitk: Replaced green with #00FF00.
That should be
Subject: [PATCH] gitk: replace green with #00FF00
around here. Instead of reporting what you did in the past tense,
you give an order to somebody to do something to
By committed, I assume you meat that you have dirA/unco as an
untracked file, and dirA/committed as a file in the index?
Of course,
Thanks for putting this together. I agree with the expected output in
each case, and I think this covers the cases we have seen (case 1 is
Michael's original
Heya,
I just ran into the following with `git stash`. The set-up:
git init
echo Initial foo
git add .
git commit -m 'Initial commit'
echo Rewrite foo
git commit -am 'Second commit, rewrites content'
echo Stashed changes foo
git
Antoine Pelisse apeli...@gmail.com writes:
Currently you can use mailmap to display log authors and committers
but you can't use the mailmap to find commits with mapped values.
This commit allows you to run:
git log --use-mailmap --author mapped_name_or_email
git log --use-mailmap
Junio C Hamano gits...@pobox.com writes:
Thanks. I'll queue this on top.
-- 8 --
Subject: [PATCH] log --use-mailmap: optimize for cases without
--author/--committer search
And this I will *not* queue further on top.
-- 8 --
Subject: [PATCH] [DO NOT USE] log --use-mailmap
Alex Vandiver a...@chmrr.net writes:
Heya,
I just ran into the following with `git stash`. The set-up:
...
$ git stash pop
Auto-merging foo
CONFLICT (content): Merge conflict in foo
Recorded preimage for 'foo'
$ git stash
foo: needs merge
foo: needs merge
foo: unmerged
On Thu, 2012-12-27 at 10:51 -0800, Junio C Hamano wrote:
$ git stash
foo: needs merge
foo: needs merge
foo: unmerged (aeaa7e5e87cf309a7368d5d92a71c1f9e6a8c9e7)
foo: unmerged (a77fa514de2720c72c1a861de098595959a2c97a)
foo: unmerged (4a622d2b991f1a19ba7be313a46dc6f03692cd0a)
fatal:
On Thu, Dec 27, 2012 at 01:55:56PM -0500, Alex Vandiver wrote:
On Thu, 2012-12-27 at 10:51 -0800, Junio C Hamano wrote:
$ git stash
foo: needs merge
foo: needs merge
foo: unmerged (aeaa7e5e87cf309a7368d5d92a71c1f9e6a8c9e7)
foo: unmerged (a77fa514de2720c72c1a861de098595959a2c97a)
Alex Vandiver a...@chmrr.net writes:
... Cannot stash while resolving conflicts or similar would be
more understandable to the end user than the above.
Interestingly enough, the apply side is protected with this one
liner:
# current index state
c_tree=$(git write-tree) ||
Jeff King p...@peff.net writes:
but I suspect it is not sufficient:
1. There are other code paths that will end up in write-tree which
should probably be protected, too.
Among 6 calls to write-tree, only the first ones in create_stash and
apply_stash are about the index the user
On do, 2012-12-20 at 10:30 -0800, Junio C Hamano wrote:
Which platforms that are long-term-maintained by their vendors still
pin their Python at 2.4.X?
RHEL 5.x and its clones still use python 2.4. It is supported by red hat
until at least 2017 (though end of production phase two, Q1 2014,
On Wednesday, December 26, 2012 01:24:39 am Michael Haggerty
wrote:
... lots of discussion about ref locking...
It concerns me that git uses any locking at all, even for
refs since it has the potential to leave around stale locks.
For a single user repo this is not a big deal, the lock can
The latest maintenance release Git v1.8.0.3 is now available at
the usual places.
This is primarily to down-merge documentation updates that have been
accumulating to the 'master' front for the upcoming 1.8.1 to the
maintenance series.
The release tarballs are found at:
read more at : http://www.thomassabouksaleonline2013.co.uk/
--
View this message in context:
http://git.661346.n2.nabble.com/nike-air-max-95-tp7571318p7573747.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Thomas Sabo http://www.thomassabouksaleonline2013.co.uk/ was initially
developed in Germany and the Thomas Sabo Charm Club Collection is now
renowned all over the world. This jewelry spread across Europe side and the
United States in initial years. It was in the year 1984 that this fashion
My branches are very long so for years I have been doing a lot of scrolling
when using gitk. I have just now discovered how to see a simplified history.
For this example history where commits were added in alphabetical order:
A--B--C--D--H
\
E--F--G--I
\
CORRECTION:
So I hope to see:
* 00a27e0 J
| * 160d232 I
|/
* b981ea0 F
| * daa5b69 H
|/
* 546ae44 B
* 734db0c A
On 28/12/2012, David bouncingc...@gmail.com wrote:
My branches are very long so for years I have been doing a lot of scrolling
when using gitk. I
It takes a text file, a pattern, a number n and pathname flag. Each
line in the text file is matched against the pattern n times. If
pathname is given, FNM_PATHNAME is used.
test-wildmatch is built with -O2 and tested against glibc 2.14.1 (also
-O2) and compat/fnmatch. The input file is
So far, wildmatch() has always honoured directory boundary and there
was no way to turn it off. Make it behave more like fnmatch() by
requiring all callers that want the FNM_PATHNAME behaviour to pass
that in the equivalent flag WM_PATHNAME. Callers that do not specify
WM_PATHNAME will get
This is similar to NO_FNMATCH but it uses wildmatch instead of
compat/fnmatch. This is an intermediate step to let wildmatch be used
as fnmatch replacement for wider audience before it replaces fnmatch
completely and compat/fnmatch is removed.
fnmatch in test-wildmatch is not impacted by this and
v2 has no big changes:
- 'special' variable in dowild() is removed in favor of two
new, better named ones
- fix TRUE/FALSE in comments as well as code in the rename patch
- some tests for */ and *literal optimizations
- USE_WILDMATCH patch is moved to the end of the series
Nguyễn Thái
'special' is too generic and is used for two different purposes.
Replace it with 'match_slash' to indicate ** pattern and 'negated'
for [!...] and [^...].
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wildmatch.c | 18 +-
1 file changed, 9 insertions(+), 9
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wildmatch.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/wildmatch.c b/wildmatch.c
index f9b6451..68e4213 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -52,7 +52,7 @@ typedef unsigned char uchar;
compat, '*/*/*' on linux-2.6.git file list 2000 times, before:
wildmatch 7s 985049us
fnmatch 2s 735541us or 34.26% faster
and after:
wildmatch 4s 492549us
fnmatch 0s 888263us or 19.77% slower
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t/t3070-wildmatch.sh | 6 ++
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
compat/fnmatch/fnmatch.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c
index 9473aed..6f7387d 100644
--- a/compat/fnmatch/fnmatch.c
+++ b/compat/fnmatch/fnmatch.c
- All exported constants now have a prefix WM_
- Do not rely on FNM_* constants, use the WM_ counterparts
- Remove TRUE and FALSE to follow Git's coding style
- While at it, turn flags type from int to unsigned int
- Add an (unused yet) argument to carry extra information
so that we don't have
Normally we need recursion for *. In this case we know that it
matches everything until / so we can skip the recursion.
glibc, '*/*/*' on linux-2.6.git file list 2000 times
before:
wildmatch 8s 74513us
fnmatch 1s 97042us or 13.59% faster
after:
wildmatch 3s 521862us
fnmatch 3s 488616us or
On Mon, Dec 24, 2012 at 09:24:39AM -0800, Martin von Zweigbergk wrote:
On Sun, Dec 23, 2012 at 11:31 PM, Woody Wu narkewo...@gmail.com wrote:
On Sun, Dec 23, 2012 at 11:09:58PM -0500, Seth Robertson wrote:
In message 20121224035825.GA17203@zuhnb712, Woody Wu writes:
How can I find
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/wildmatch.c b/wildmatch.c
index a79f97e..4fe1d65 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -77,14 +77,17 @@ static int dowild(const uchar *p, const uchar *text,
unsigned int flags)
continue;
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
compat, '*/*/*' on linux-2.6.git file list 2000 times, before:
wildmatch 7s 985049us
fnmatch 2s 735541us or 34.26% faster
and after:
wildmatch 4s 492549us
fnmatch 0s 888263us or 19.77% slower
Signed-off-by: Nguyễn Thái Ngọc Duy
On Thu, Dec 27, 2012 at 9:15 PM, Woody Wu narkewo...@gmail.com wrote:
On Mon, Dec 24, 2012 at 09:24:39AM -0800, Martin von Zweigbergk wrote:
On Sun, Dec 23, 2012 at 11:31 PM, Woody Wu narkewo...@gmail.com wrote:
This is not working to me since I have more than one local branch that
On Fri, Dec 28, 2012 at 1:24 PM, Junio C Hamano gits...@pobox.com wrote:
+ while ((t_ch = *text) != '\0'
+(!(flags WM_PATHNAME) || t_ch
!= '/')) {
Why do we look at (flags WM_PATHMAME) and not special here?
On Fri, Dec 28, 2012 at 1:24 PM, Junio C Hamano gits...@pobox.com wrote:
if (*++p == '*') {
const uchar *prev_p = p - 2;
while (*++p == '*') {}
- if ((prev_p == text || *prev_p == '/')
38 matches
Mail list logo
