Pandora bracelet charms is often obtained in sterling silver

2013-01-13 Thread gloria5858
pandora bracelet charms possesses thus come to be a remarkably favorite brand of necklaces. There are various items of necklaces anybody can invest in. In truth you will discover a wide variety items of necklaces from which to choose it's really a incredibly

[PATCH v2 8/6] t9600: adjust for new cvsimport

2013-01-13 Thread Junio C Hamano
The rewritten cvsimport does not skip the latest 10 minutes worth of CVS commits by default, so there is no need to pass the "-a" option; it will barf if it sees "-a". Also it will do the merge itself, so there is no need to merge "origin" ourselves, either. Signed-off-by: Junio C Hamano --- *

[PATCH v2 7/6] t9600: further prepare for sharing

2013-01-13 Thread Junio C Hamano
When t9650, which dot-sources this script, really becomes ready to test the new cvsimport, we no longer depend on having PERL to run this test through it. Move the PERL dependency to lib-cvs.sh instead. Signed-off-by: Junio C Hamano --- t/lib-cvs.sh | 7 +++ t/t9600-cvsimport.sh |

Re: [PATCH v2 0/6] A smoother transition plan for cvsimport

2013-01-13 Thread Jonathan Nieder
Junio C Hamano wrote: > Junio C Hamano (6): > Makefile: add description on PERL/PYTHON_PATH > cvsimport: allow setting a custom cvsps (2.x) program name > cvsimport: introduce a version-switch wrapper > cvsimport: start adding cvsps 3.x support > cvsimport: make tests reusable for cvsimp

[PATCH v2 6/6] cvsimport-3: add a sample test

2013-01-13 Thread Junio C Hamano
This is primarily for illustration to show how the support introduced by the previous step can be used. Some parts of t9600 needs to be made conditional to the value of TEST_CVSPS_VERSION to avoid passing options the new cvsimport does not need or understand, before this can become usable as a rea

[PATCH v2 5/6] cvsimport: make tests reusable for cvsimport-3

2013-01-13 Thread Junio C Hamano
This way, a dual-use test can be dot-sourced into a new test script after defining GIT_CVSPS_VERSION=3 to test that the new cvsimport with cvsps (3.x) works on simple test histories that old cvsimport can grok correctly. Also allow CVSPS2_PATH and CVSPS3_PATH to be defined as "NoThanks" to cause t

[PATCH v2 3/6] cvsimport: introduce a version-switch wrapper

2013-01-13 Thread Junio C Hamano
In preparation to have both old and new cvsimport during the transition period, rename the cvsimport script to cvsimport-2 and introduce a small wrapper that we can later change it to allow users to run either frontend (with their corresponding cvsps backends). Signed-off-by: Junio C Hamano ---

[PATCH v2 4/6] cvsimport: start adding cvsps 3.x support

2013-01-13 Thread Junio C Hamano
The new cvsps 3.x series lacks support of some options cvsps 2.x series had and used by cvsimport-2; add a replacement program from the author of cvsps 3.x and allow users to choose it by setting the GIT_CVSPS_VERSION environment variable to 3. We would later add support to auto-detect the version

[PATCH v2 2/6] cvsimport: allow setting a custom cvsps (2.x) program name

2013-01-13 Thread Junio C Hamano
Distros may ship old cvsps under a different name, or the user may install it outside the normal $PATH. Allow setting CVSPS2_PATH from the build environment. Signed-off-by: Junio C Hamano --- Makefile | 9 +++-- git-cvsimport.perl | 4 +++- t/lib-cvs.sh | 4 +++- 3 files cha

[PATCH v2 0/6] A smoother transition plan for cvsimport

2013-01-13 Thread Junio C Hamano
The theme is the same as the previous 3-patch series ($gmane/213415). The first one is unrelated. The last two are new, adding the "dual-use test" framework hinted at the end of the previous round. Oh, also this time the series is formatted with "format-patch -M", to avoid overwhelming the reade

[PATCH v2 1/6] Makefile: add description on PERL/PYTHON_PATH

2013-01-13 Thread Junio C Hamano
Signed-off-by: Junio C Hamano --- Makefile | 5 + 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 1b30d7b..1695075 100644 --- a/Makefile +++ b/Makefile @@ -241,11 +241,16 @@ all:: # apostrophes to be ASCII so that cut&pasting examples to the shell # will work. # +#

Re: Announcing git-reparent

2013-01-13 Thread Jonathan Nieder
Hi Mark, Mark Lodato wrote: > Create a new commit object that has the same tree and commit message as HEAD > but with a different set of parents. If ``--no-reset`` is given, the full > object id of this commit is printed and the program exits I've been wishing for something like this for a long

Re: git list files

2013-01-13 Thread Jonathan Nieder
Jeff King wrote: > As far as I recall, that script works. However, I have a pure-C > blame-tree implementation that is much faster, which may also be of > interest. I need to clean up and put a few finishing touches on it to > send it to the list, but it has been in production at GitHub for a few

Re: [PATCH 00/14] Remove unused code from imap-send.c

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: > imap-send.c | 286 > +--- > 1 file changed, 39 insertions(+), 247 deletions(-) See my replies for comments on patches 1, 6, 9, 11, and 12. The rest are Reviewed-by: Jonathan Nieder The series is tasteful and e

Re: [PATCH 12/14] imap-send.c: use struct imap_store instead of struct store

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: > In fact, all struct store instances are upcasts of struct imap_store > anyway, so stop making the distinction. Nice. It is tempting to fold "struct store" into "struct imap_store" at the same time, as in struct imap_store { struct {

Re: [PATCH 11/14] imap-send.c: simplify logic in lf_to_crlf()

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: > Signed-off-by: Michael Haggerty > --- > imap-send.c | 31 --- > 1 file changed, 8 insertions(+), 23 deletions(-) I like the code reduction, but my nighttime brain doesn't have the patience to understand the preimage or postimage, and the abo

Re: [PATCH 09/14] imap-send.c: remove namespace fields from struct imap

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: [...] > @@ -722,9 +667,9 @@ static int get_cmd_result(struct imap_store *ctx, struct > imap_cmd *tcmd) > } > > if (!strcmp("NAMESPACE", arg)) { > - imap->ns_personal = parse_list(&cmd); > -

Re: cvs-fast-export release announcement

2013-01-13 Thread Jonathan Nieder
Eric S. Raymond wrote: > cvs-fast-export. Project page, with links to documentation and the > public repository, is at . Yay, thanks for building this. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord..

Re: [PATCH 06/14] imap-send.c: remove some unused fields from struct store

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: > --- a/imap-send.c > +++ b/imap-send.c [...] > @@ -772,13 +767,10 @@ static int get_cmd_result(struct imap_store *ctx, > struct imap_cmd *tcmd) > !strcmp("NO", arg) || !strcmp("BYE", arg)) { > if ((resp = pars

Announcing git-reparent

2013-01-13 Thread Mark Lodato
I threw together a small utility called "git-reparent", available on GitHub at: https://github.com/MarkLodato/git-reparent I welcome any comments or suggestions. To make discussion easier, I've copied the README and code below. --- 8< --- NAME git-reparent - Recommit HEAD with a new

Re: [PATCH 00/14] Remove unused code from imap-send.c

2013-01-13 Thread Jeff King
On Mon, Jan 14, 2013 at 06:32:32AM +0100, Michael Haggerty wrote: > As discussed before [1], imap-send.c was copied from isync, including > a lot of code that is not used within the git project. This patch > series rips a bunch of it out. Thanks, this looks like a good direction. I did not noti

Re: [PATCH 01/14] imap-send.c: remove msg_data::flags, which was always zero

2013-01-13 Thread Jonathan Nieder
Hi, Michael Haggerty wrote: > This removes the need for function imap_make_flags(), so delete it, > too. [...] > --- a/imap-send.c > +++ b/imap-send.c [...] > box = gctx->name; > prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix; > cb.create = 0; > - ret = imap_exec_m(ctx, &

[PATCH 09/14] imap-send.c: remove namespace fields from struct imap

2013-01-13 Thread Michael Haggerty
They are unused, and their removal means that a bunch of list-related infrastructure can be disposed of. Signed-off-by: Michael Haggerty --- imap-send.c | 74 +++-- 1 file changed, 8 insertions(+), 66 deletions(-) diff --git a/imap-send.c

[PATCH 11/14] imap-send.c: simplify logic in lf_to_crlf()

2013-01-13 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- imap-send.c | 31 --- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/imap-send.c b/imap-send.c index 70abe9b..3167dcc 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1089,36 +1089,21 @@ static void lf_to_crlf(struct s

[PATCH 12/14] imap-send.c: use struct imap_store instead of struct store

2013-01-13 Thread Michael Haggerty
In fact, all struct store instances are upcasts of struct imap_store anyway, so stop making the distinction. Signed-off-by: Michael Haggerty --- imap-send.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/imap-send.c b/imap-send.c index 3167dcc..31fdbf3 1

[PATCH 07/14] imap-send.c: inline imap_parse_list() in imap_list()

2013-01-13 Thread Michael Haggerty
The function is only called from here. Signed-off-by: Michael Haggerty --- imap-send.c | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/imap-send.c b/imap-send.c index fe2bfab..452e73e 100644 --- a/imap-send.c +++ b/imap-send.c @@ -669,21 +669,16 @@ bail: retu

[PATCH 03/14] iamp-send.c: remove unused struct imap_store_conf

2013-01-13 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- imap-send.c | 5 - 1 file changed, 5 deletions(-) diff --git a/imap-send.c b/imap-send.c index a8cb66a..d675e70 100644 --- a/imap-send.c +++ b/imap-send.c @@ -130,11 +130,6 @@ static struct imap_server_conf server = { NULL, /* auth_method */ };

[PATCH 01/14] imap-send.c: remove msg_data::flags, which was always zero

2013-01-13 Thread Michael Haggerty
This removes the need for function imap_make_flags(), so delete it, too. Signed-off-by: Michael Haggerty --- imap-send.c | 40 +++- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/imap-send.c b/imap-send.c index e521e2f..451d502 100644 --- a/ima

[PATCH 14/14] imap-send.c: fold struct store into struct imap_store

2013-01-13 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- imap-send.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index 4d24faf..1b665bb 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,12 +33,6 @@ typedef void *SSL; #include #endif -struct s

[PATCH 10/14] imap-send.c: remove unused field imap_store::trashnc

2013-01-13 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- imap-send.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/imap-send.c b/imap-send.c index 9616e80..70abe9b 100644 --- a/imap-send.c +++ b/imap-send.c @@ -127,7 +127,6 @@ struct imap_store { int uidvalidity; struct imap *imap; con

[PATCH 13/14] imap-send.c: remove unused field imap_store::uidvalidity

2013-01-13 Thread Michael Haggerty
I suspect that the existence of both imap_store::uidvalidity and store::uidvalidity was an accident. Signed-off-by: Michael Haggerty --- imap-send.c | 1 - 1 file changed, 1 deletion(-) diff --git a/imap-send.c b/imap-send.c index 31fdbf3..4d24faf 100644 --- a/imap-send.c +++ b/imap-send.c @@ -

[PATCH 08/14] imap-send.c: remove struct imap argument to parse_imap_list_l()

2013-01-13 Thread Michael Haggerty
It was always set to NULL. Signed-off-by: Michael Haggerty --- imap-send.c | 39 +++ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/imap-send.c b/imap-send.c index 452e73e..5238c74 100644 --- a/imap-send.c +++ b/imap-send.c @@ -578,11 +578,10 @

[PATCH 05/14] imap-send.c: remove struct message

2013-01-13 Thread Michael Haggerty
It was never used. Signed-off-by: Michael Haggerty --- imap-send.c | 26 -- 1 file changed, 26 deletions(-) diff --git a/imap-send.c b/imap-send.c index 3177361..a47008b 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,23 +33,10 @@ typedef void *SSL; #include #endif

[PATCH 06/14] imap-send.c: remove some unused fields from struct store

2013-01-13 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- imap-send.c | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/imap-send.c b/imap-send.c index a47008b..fe2bfab 100644 --- a/imap-send.c +++ b/imap-send.c @@ -36,12 +36,7 @@ typedef void *SSL; struct store { /* curren

[PATCH 04/14] imap-send.c: remove struct store_conf

2013-01-13 Thread Michael Haggerty
It was never used. Signed-off-by: Michael Haggerty --- imap-send.c | 11 --- 1 file changed, 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index d675e70..3177361 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,15 +33,6 @@ typedef void *SSL; #include #endif -struct store_

[PATCH 02/14] imap-send.c: remove struct msg_data

2013-01-13 Thread Michael Haggerty
Now that its flags member has been deleted, all that is left is a strbuf. So use a strbuf directly. Signed-off-by: Michael Haggerty --- imap-send.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index 451d502..a8cb66a 100644 ---

[PATCH 00/14] Remove unused code from imap-send.c

2013-01-13 Thread Michael Haggerty
As discussed before [1], imap-send.c was copied from isync, including a lot of code that is not used within the git project. This patch series rips a bunch of it out. [1] http://comments.gmane.org/gmane.comp.version-control.git/210355 Michael Haggerty (14): imap-send.c: remove msg_data::flags,

Re: [PATCH] cvsimport: rewrite to use cvsps 3.x to fix major bugs

2013-01-13 Thread Michael Haggerty
On 01/13/2013 11:20 PM, Junio C Hamano wrote: > After a quick survey of various distros, I think it is very unlikely > that we will see "distros move on to newer cvsps, leaving cvsimport > broken" situation. If anything, it is more like "distros decide to > ignore the new cvsps, until it is made to

Re: [PATCH 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-13 Thread Michael Haggerty
On 01/13/2013 05:17 PM, John Keeping wrote: > On Sun, Jan 13, 2013 at 04:26:39AM +0100, Michael Haggerty wrote: >> On 01/12/2013 08:23 PM, John Keeping wrote: >>> Although 2to3 will fix most issues in Python 2 code to make it run under >>> Python 3, it does not handle the new strict separation betw

[PATCH/RFC v2 8/8] contrib/subtree: Handle '--prefix' argument with a slash appended

2013-01-13 Thread Techlive Zheng
'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng --- contrib/subtree/git-subtree.sh | 2 +- contrib/subtree/t/t7900-subtree.sh | 19 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/contrib/subt

[PATCH/RFC v2 7/8] contrib/subtree: Use %B for the split commit message

2013-01-13 Thread Techlive Zheng
Use %B rather than %s%n%n%b to handle the special case of a commit that only has a subject line. We don't want to introduce a newline after the subject, causing generation of a new hash. After this commit, the newly split branch might differ from the previous one. If this is the case, --fallback

[PATCH/RFC v2 6/8] contrib/subtree: Make each test self-contained

2013-01-13 Thread Techlive Zheng
Signed-off-by: Techlive Zheng --- contrib/subtree/t/t7900-subtree.sh | 865 ++--- 1 file changed, 614 insertions(+), 251 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 69bd41c..ef83f31 100755 --- a/contrib/

[PATCH/RFC v2 5/8] contrib/subtree: Code cleaning and refactoring

2013-01-13 Thread Techlive Zheng
Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng --- contrib/subtree/t/t7900-subtree.sh | 251 +++-- 1 file changed, 130 insertions(+), 121 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtre

[PATCH/RFC v2 4/8] contrib/subtree: Remove test number comments

2013-01-13 Thread Techlive Zheng
From: "David A. Greene" Delete the comments indicating test numbers as it causes maintenance headaches. t*.sh -i will help us find any broken tests. Signed-off-by: David A. Greene Signed-off-by: Techlive Zheng --- contrib/subtree/t/t7900-subtree.sh | 55 --

[PATCH/RFC v2 3/8] contrib/subtree: Ignore testing directory

2013-01-13 Thread Techlive Zheng
Signed-off-by: Techlive Zheng --- contrib/subtree/.gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 91360a3..59aeeb4 100644 --- a/contrib/subtree/.gitignore +++ b/contrib/subtree/.gitignore @@ -1,6 +1,

[PATCH/RFC v2 1/8] contrib/subtree: Fix whitespaces

2013-01-13 Thread Techlive Zheng
Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt| 42 ++--- contrib/subtree/t/t7900-subtree.sh | 314 ++--- 3 files changed, 212 insert

[PATCH/RFC v2 2/8] contrib/subtree: Add vim modeline

2013-01-13 Thread Techlive Zheng
Signed-off-by: Techlive Zheng --- contrib/subtree/git-subtree.sh | 2 ++ contrib/subtree/t/t7900-subtree.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 70f86ea..88903c0 100755 --- a/contrib/subtree/git-subtree.sh

[PATCH/RFC v2 0/8] contrib/subtree: Reroll to follow Git's whitespace policy

2013-01-13 Thread Techlive Zheng
David A. Greene (1): contrib/subtree: Remove test number comments Techlive Zheng (7): contrib/subtree: Fix whitespaces contrib/subtree: Add vim modeline contrib/subtree: Ignore testing directory contrib/subtree: Code cleaning and refactoring contrib/subtree: Make each test self-contain

Re: [PATCH/RFC 4/7] contrib/subtree: Code cleaning and refactoring

2013-01-13 Thread Techlive Zheng
2013/1/13 Techlive Zheng : > Mostly prepare for the later tests refactoring. > > Signed-off-by: Techlive Zheng I am personally a SP-indenting guy, I did not aware of Git's indenting policy until now, so it is bad that I replaced all the lines initially indent using HT with SP in the test file of

Re: [PATCH 2/3] cvsimport: introduce a version-switch wrapper

2013-01-13 Thread Junio C Hamano
Junio C Hamano writes: > In preparation to have both old and new cvsimport during the > transition period, rename the cvsimport script to cvsimport-2 > and introduce a small wrapper that we can later change it to > allow users to run either frontend (with their corresponding > cvsps backends). >

[PATCH 3/3] cvsimport: start adding cvsps 3.x support

2013-01-13 Thread Junio C Hamano
The new cvsps 3.x series lacks support of some options cvsps 2.x series had and used by cvsimport-2; add a replacement program from the author of cvsps 3.x and allow users to choose it by setting the GIT_CVSPS_VERSION environment variable to 3. We would later add support to auto-detect the version

[PATCH 1/3] cvsimport: allow setting a custom cvsps (2.x) program name

2013-01-13 Thread Junio C Hamano
Distros may ship old cvsps under a different name, or the user may install it outside the normal $PATH. Allow setting CVSPS2_PATH from the build environment. Signed-off-by: Junio C Hamano --- Makefile | 9 +++-- git-cvsimport.perl | 4 +++- t/lib-cvs.sh | 4 +++- 3 files cha

[PATCH 0/3] A smoother transition plan for cvsimport

2013-01-13 Thread Junio C Hamano
So here is a start of how such a transition plan outlined in the previous message may look like. The first two are preparatory step to allow the current code to still work even when cvsps2 and cvsps3 are both available on the system. The last patch is mostly for illustration purposes; the cvsimpo

Re: What's cooking in git.git (Jan 2013, #05; Fri, 11)

2013-01-13 Thread Duy Nguyen
On Mon, Jan 14, 2013 at 6:02 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Sat, Jan 12, 2013 at 6:56 AM, Junio C Hamano wrote: >>> * nd/parse-pathspec (2013-01-11) 20 commits >>> >>> Uses the parsed pathspec structure in more places where we used to >>> use the raw "array of strings"

Re: [PATCH v3 03/31] Add parse_pathspec() that converts cmdline args to struct pathspec

2013-01-13 Thread Duy Nguyen
On Mon, Jan 14, 2013 at 7:05 AM, Martin von Zweigbergk wrote: > On Sun, Jan 13, 2013 at 4:35 AM, Nguyễn Thái Ngọc Duy > wrote: >> +static void parse_pathspec(struct pathspec *pathspec, >> + unsigned magic_mask, unsigned flags, >> + const char *pr

cvs-fast-export release announcement

2013-01-13 Thread Eric S. Raymond
Version 0.2 of the code formerly known as parsecvs has just shipped as cvs-fast-export. Project page, with links to documentation and the public repository, is at . I have some cvsps and reposurgeon patches to merge before I can get back to the script wra

Re: [PATCH v3 03/31] Add parse_pathspec() that converts cmdline args to struct pathspec

2013-01-13 Thread Martin von Zweigbergk
On Sun, Jan 13, 2013 at 4:35 AM, Nguyễn Thái Ngọc Duy wrote: > +static void parse_pathspec(struct pathspec *pathspec, > + unsigned magic_mask, unsigned flags, > + const char *prefix, const char **argv) > +{ > + struct pathspec_item *item; > +

Re: [PATCH] cvsimport: rewrite to use cvsps 3.x to fix major bugs

2013-01-13 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Nieder writes: > >> Michael Haggerty wrote: >> >>> Regarding your claim that "within a few months the Perl git-cvsimport is >>> going to cease even pretending to work": It might be that the old >>> git-cvsimport will stop working *for people who upgrade to cvsps

Re: [PATCH] t0050: mark TC merge (case change) as success

2013-01-13 Thread Junio C Hamano
Torsten Bögershausen writes: > The test "merge (case change)" passes on a case ignoring file system > > Use test_expect_success to remove the "known breakage vanished" > > Signed-off-by: Torsten Bögershausen > --- Interesting. When did this change? Do you happen to have a bisection? Or did t

Re: [PATCH v3 00/31] nd/parse-pathspec

2013-01-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Changes from v2 (it's hard to keep track of after the rebase, so I may > be missing something here): > > - rebased on top of recent master, incorporate changes in >init_pathspec from jk/pathspec-literal and nd/pathspec-wildcard to >parse_pathspec > > - ki

Re: git-completion.bash should not add a space after a ref

2013-01-13 Thread Junio C Hamano
Manlio Perillo writes: > This is not really a bug, but a small usability problem. > > When completing a reference, Bash will add a space after the reference name. > > As an example in: > > $git show master > > The problem is that an user may want to show a tree or blog object from > master: >

Re: What's cooking in git.git (Jan 2013, #05; Fri, 11)

2013-01-13 Thread Junio C Hamano
Duy Nguyen writes: > On Sat, Jan 12, 2013 at 6:56 AM, Junio C Hamano wrote: >> * nd/parse-pathspec (2013-01-11) 20 commits >> >> Uses the parsed pathspec structure in more places where we used to >> use the raw "array of strings" pathspec. >> >> Unfortunately, this conflicts a couple of topic

Re: [PATCH v5] git-completion.bash: add support for path completion

2013-01-13 Thread Junio C Hamano
Manlio Perillo writes: > Il 11/01/2013 23:02, Junio C Hamano ha scritto: >> Manlio Perillo writes: >> >>> +# Process path list returned by "ls-files" and "diff-index --name-only" >>> +# commands, in order to list only file names relative to a specified >>> +# directory, and append a slash to di

Re: [PATCH v5] git-completion.bash: add support for path completion

2013-01-13 Thread Junio C Hamano
Manlio Perillo writes: >> +# Skip "git" (first argument) >> +for ((i=1; i < ${#words[@]}; i++)); do >> +word="${words[i]}" >> + >> +case "$word" in >> +--) > > Sorry, I have incorrectly (again) indented the case labels. > I have now configured m

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-13 Thread Junio C Hamano
Jonathan Nieder writes: > Hi, > > Torsten Bögershausen wrote: > >> -/^\s*[^#]\s*which\s/ and err 'which is not portable (please use type)'; >> +/^\s*[^#]\s*which\s+[-a-zA-Z0-9]+$/ and err 'which is not portable >> (please use type)'; > > Hmm. Neither the old version nor the new one matc

Re: [PATCH] cvsimport: rewrite to use cvsps 3.x to fix major bugs

2013-01-13 Thread Junio C Hamano
Jonathan Nieder writes: > Michael Haggerty wrote: > >> Regarding your claim that "within a few months the Perl git-cvsimport is >> going to cease even pretending to work": It might be that the old >> git-cvsimport will stop working *for people who upgrade to cvsps 3.x*. >> But it is not realistic

[PATCH] t0050: mark TC merge (case change) as success

2013-01-13 Thread Torsten Bögershausen
The test "merge (case change)" passes on a case ignoring file system Use test_expect_success to remove the "known breakage vanished" Signed-off-by: Torsten Bögershausen --- t/t0050-filesystem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-

[PATCH] t0050: mark TC merge (case change) as success

2013-01-13 Thread Torsten Bögershausen
The test "merge (case change)" passes on a case ignoring file system Use test_expect_success to remove the "known breakage vanished" Signed-off-by: Torsten Bögershausen --- t/t0050-filesystem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-

Re: git list files

2013-01-13 Thread Jeff King
On Sun, Jan 13, 2013 at 09:56:02AM -0800, Jonathan Nieder wrote: > > lets, say the equivalent of the $ls -d b* within git.git root directory > > would look like: > > > > > > 98746061 jrnieder 2010-08-12 17:11 Standardize-do-.-while-0-style base85.c > > c43cb386 pclouds 2012-10-

Re: [PATCH] archive-tar: fix sanity check in config parsing

2013-01-13 Thread Jeff King
On Sun, Jan 13, 2013 at 06:42:01PM +0100, René Scharfe wrote: > When parsing these config variable names, we currently check that > the second dot is found nine characters into the name, disallowing > filter names with a length of five characters. Additionally, > git archive crashes when the seco

Re: git list files

2013-01-13 Thread Стойчо Слепцов
thanks alot, Jonathan, I'll try to search through those scripts. Blind. 2013/1/13 Jonathan Nieder : > Hi, > > Стойчо Слепцов wrote: > >> lets, say the equivalent of the $ls -d b* within git.git root directory >> would look like: >> >> >> 98746061 jrnieder 2010-08-12 17:11 Standar

Re: git list files

2013-01-13 Thread Стойчо Слепцов
not really, ls-tree provides the hash of blobs and trees, what I am searching for is"the last commit"who introduced the blob or tree. but, hey, thanks for the answer! Blind 2013/1/13 Matthieu Moy : > Стойчо Слепцов writes: > >> Hi, >> >> I was searching for some git- command to provide me a list

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-13 Thread Mark Levedahl
On 01/11/2013 03:17 PM, Alex Riesen wrote: On Fri, Jan 11, 2013 at 9:08 PM, Alex Riesen wrote: This short discussion on GitHub (file git-compat-util.h) might be relevant: https://github.com/msysgit/git/commit/435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6#commitcomment-2407194 The change suggested

Re: git list files

2013-01-13 Thread Jonathan Nieder
Hi, Стойчо Слепцов wrote: > lets, say the equivalent of the $ls -d b* within git.git root directory > would look like: > > > 98746061 jrnieder 2010-08-12 17:11 Standardize-do-.-while-0-style base85.c > c43cb386 pclouds 2012-10-26 22:53 Move-estimate_bisect_steps-to-li bisect.c

Re: [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes

2013-01-13 Thread John Keeping
On Sun, Jan 13, 2013 at 12:14:02PM -0500, Pete Wyckoff wrote: > j...@keeping.me.uk wrote on Sun, 13 Jan 2013 16:26 +: >> On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote: >> > j...@keeping.me.uk wrote on Sat, 12 Jan 2013 19:23 +: >> >> When different version of python are used t

[PATCH] archive-tar: fix sanity check in config parsing

2013-01-13 Thread René Scharfe
git archive supports passing generated tar archives through filter commands like gzip. Additional filters can be set up using the configuration variables tar..command and tar..remote. When parsing these config variable names, we currently check that the second dot is found nine characters into th

Re: [PATCH 0/8] Initial support for Python 3

2013-01-13 Thread John Keeping
On Sun, Jan 13, 2013 at 11:40:45AM -0500, Pete Wyckoff wrote: > j...@keeping.me.uk wrote on Sun, 13 Jan 2013 00:41 +: >> On Sat, Jan 12, 2013 at 06:43:04PM -0500, Pete Wyckoff wrote: >> > Can you give me some hints about the byte/unicode string issues >> > in git-p4.py? There's really only one

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-13 Thread Jonathan Nieder
Hi, Torsten Bögershausen wrote: > - /^\s*[^#]\s*which\s/ and err 'which is not portable (please use type)'; > + /^\s*[^#]\s*which\s+[-a-zA-Z0-9]+$/ and err 'which is not portable > (please use type)'; Hmm. Neither the old version nor the new one matches what seem to be typical uses of

Re: [PATCH] t/lib-cvs: cvsimport no longer works without Python >= 2.7

2013-01-13 Thread John Keeping
On Sat, Jan 12, 2013 at 04:27:36PM +0100, Michael Haggerty wrote: >> Even if we were to rip out the fallback code that uses the 2.7-only >> subprocess.check_output() on "cvsps -V", the function is also used >> for doing the real work interacting with cvsps-3.x, so I think this >> patch will be

Re: [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes

2013-01-13 Thread Pete Wyckoff
j...@keeping.me.uk wrote on Sun, 13 Jan 2013 16:26 +: > On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote: > > j...@keeping.me.uk wrote on Sat, 12 Jan 2013 19:23 +: > >> When different version of python are used to build via distutils, the > >> behaviour can change. Detect chang

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-13 Thread Matt Kraai
On Sun, Jan 13, 2013 at 11:25:57AM +0100, Torsten Bögershausen wrote: > @@ -16,10 +16,10 @@ sub err { > > while (<>) { > chomp; > - /^\s*sed\s+-i/ and err 'sed -i is not portable'; > - /^\s*echo\s+-n/ and err 'echo -n is not portable (please use printf)'; > - /^\s*declare\s+/ a

Re: [PATCH 0/8] Initial support for Python 3

2013-01-13 Thread Pete Wyckoff
j...@keeping.me.uk wrote on Sun, 13 Jan 2013 00:41 +: > On Sat, Jan 12, 2013 at 06:43:04PM -0500, Pete Wyckoff wrote: > > Can you give me some hints about the byte/unicode string issues > > in git-p4.py? There's really only one place that does: > > > > p4 = subprocess.Popen("p4 -G ...") >

Re: [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes

2013-01-13 Thread John Keeping
On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote: > j...@keeping.me.uk wrote on Sat, 12 Jan 2013 19:23 +: >> When different version of python are used to build via distutils, the >> behaviour can change. Detect changes in version and pass --force in >> this case. >[..] >> diff --gi

Re: [PATCH 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-13 Thread John Keeping
On Sun, Jan 13, 2013 at 04:26:39AM +0100, Michael Haggerty wrote: > On 01/12/2013 08:23 PM, John Keeping wrote: >> Although 2to3 will fix most issues in Python 2 code to make it run under >> Python 3, it does not handle the new strict separation between byte >> strings and unicode strings. There i

Re: git list files

2013-01-13 Thread Matthieu Moy
Стойчо Слепцов writes: > Hi, > > I was searching for some git- command to provide me a list of files > (in a git directory), same as ls, > but showing information from the last commit of the file instead. > > lets, say the equivalent of the $ls -d b* within git.git root directory > would look lik

[PATCH/WIP 10/10] Enable ls-files and ls-tree for testing PATHSPEC_ICASE

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/add.c | 6 -- builtin/ls-files.c | 3 ++- builtin/ls-tree.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index a3ffa9d..b9a5432 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -42

[PATCH/WIP 09/10] pathspec: support icase in match_pathspec_depth and tree_entry_interesting

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 17 + dir.c | 18 +++--- tree-walk.c | 30 +++--- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/cache.h b/cache.h index c3b5585..216f87c 100644 --- a/cache.h +++ b/c

[PATCH/WIP 08/10] common_prefix/read_directory: treat PATHSPEC_ICASE like wildcards

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dir.c b/dir.c index 760b776..d0e7ca8 100644 --- a/dir.c +++ b/dir.c @@ -66,15 +66,22 @@ static size_t common_prefix_len(const struct pathspec *pathspec)

[PATCH/WIP 07/10] parse_pathspec: accept :(icase)path syntax

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 1 + setup.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 9c27f18..c3b5585 100644 --- a/cache.h +++ b/cache.h @@ -480,6 +480,7 @@ extern int ie_modified(const struct index_state *, struct cache_en

[PATCH/WIP 06/10] Enable :(glob)path syntax for a lot of commands

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/add.c | 4 +++- builtin/checkout.c | 4 +++- builtin/clean.c| 4 +++- builtin/commit.c | 8 ++-- builtin/grep.c | 4 +++- builtin/ls-files.c | 4 +++- builtin/ls-tree.c | 4 +++- builtin/rerere.c

[PATCH/WIP 05/10] pathspec: prepare for :(glob)path syntax

2013-01-13 Thread Nguyễn Thái Ngọc Duy
:(glob)path differs from path that it uses wildmatch with FNM_PATHNAME while plain "path" uses fnmatch without FNM_PATHNAME. git_fnmatch() was probably ill-designed. It was intended to cover other use of fnmatch besides pathspec. But so far it's only used by pathspec code. Signed-off-by: Nguyễn T

[PATCH/WIP 04/10] parse_pathspec: save prefix information

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 2 +- setup.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 900b81a..fb54876 100644 --- a/cache.h +++ b/cache.h @@ -493,7 +493,7 @@ struct pathspec { const char *match;

[PATCH/WIP 03/10] pathspec: support :(literal) syntax for noglob pathspec

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- archive.c | 4 +++- builtin/add.c | 8 +--- builtin/checkout.c | 4 +++- builtin/clean.c| 4 +++- builtin/commit.c | 6 -- builtin/diff.c | 2 +- builtin/grep.c

[PATCH/WIP 02/10] parse_pathspec: make sure the prefix part is wildcard-free

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h| 1 + path.c | 15 ++- setup.c| 24 +++ t/t6131-pathspec-prefix.sh | 47 ++ 4 files changed, 78 insertions(+),

[PATCH/WIP 01/10] pathspec: allow to use alternate char for quoting long magic mnemonic

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Currently use parentheses, e.g. ":(icase,literal)path", but they do not play well with unix shells because they have special meaning and we need to quote them. Allow an alternate syntax ":q/icase,literal/path". Similar to ed's s/// syntax, '/' can be replaced with anything. If the opening quote ha

[PATCH/WIP 00/10] Fancy pathspec stuff

2013-01-13 Thread Nguyễn Thái Ngọc Duy
I wanted to see how new pathspec feature can be implemented after nd/parse-pathspec, mainly to see if nd/parse-pathspec needs fixing. It's nowhere near 'pu' quality but may be interesting for some people. It does: - introduce :q/.../ syntax in addition to :(...), which always requires quoting i

[PATCH v3 31/31] Rename field "raw" to "_raw" in struct pathspec

2013-01-13 Thread Nguyễn Thái Ngọc Duy
This patch is essentially no-op. It helps catching new use of this field though. This field is introduced as an intermediate step for the pathspec conversion and will be removed eventually. At this stage no more access sites should be introduced. Signed-off-by: Nguyễn Thái Ngọc Duy --- archive.c

[PATCH v3 30/31] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Put a checkpoint to guard unsupported pathspec features in future. Signed-off-by: Nguyễn Thái Ngọc Duy --- tree-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index aba6df7..718f938 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -225,7 +22

[PATCH v3 29/31] Remove match_pathspec() in favor of match_pathspec_depth()

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/add.c | 46 --- dir.c | 100 -- dir.h | 1 - 3 files changed, 20 insertions(+), 127 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 89

[PATCH v3 27/31] Remove diff_tree_{setup,release}_paths

2013-01-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/blame.c | 12 ++-- builtin/reset.c | 4 ++-- diff.h | 2 -- notes-merge.c | 4 ++-- revision.c | 5 +++-- tree-diff.c | 18 -- 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/builtin/

  1   2   >