Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Johannes Sixt
Am 11/29/2012 21:48, schrieb Junio C Hamano: > I've tested this with the testpen set on vfat mounted on my Linux > box, ... > and it seems to work OK, Works well here on Windows, too. Thanks, -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to m

links of london sale has become a 2010 usual list the model owners

2012-11-29 Thread qunima144
The organization right now offers shops in the united states, North america, Hong Kong along with the UNITED KINGDOM. The organization attempts to permit logos of the items by giving room with regard to engravings as well as embossing, in addition to generating a variety of necklaces for people to

Typically the swarovski presents a variety of less significant

2012-11-29 Thread qipaa55
Less expensive compared to utilizing semi-precious as well as valuable gemstones, Swarovski deposits provide the stunning twinkle in order to any kind of jewelry, actually official eveningwear designs. These people may be used to spice up easy denim jeans as well as golf tee clothing or even provid

swarovski schmuck assortment incorporates ravenscroft

2012-11-29 Thread muyisi447
Swarovski crystals are made with precision and are machine cut which provides flawless consistency, rich colour and a captivating sparkle. Swarovski crystals come in a variety of colours, shapes and sizes and are normally produced as beads that are used to make superb jewellery.[url=http://www.swar

Re: [PATCH v7 p2 1/2] fast-export: don't handle uninteresting refs

2012-11-29 Thread Felipe Contreras
On Thu, Nov 29, 2012 at 2:16 AM, Max Horn wrote: > > On 28.11.2012, at 23:23, Felipe Contreras wrote: > >> They have been marked as UNINTERESTING for a reason, lets respect that. >> >> Currently the first ref is handled properly, but not the rest: >> >> % git fast-export master ^uninteresting ^fo

Thomas Sabo jewelry is a tradition built

2012-11-29 Thread meidx77
The particular assortment contains 450 coronary heart elegance necklaces may be utilized necklaces, phones used to merely, jewelry and also necklaces. Thankfully there exists a right in law to style and also generate one thing of one's gorgeous household relative to this kind of goal. Right now the

New git.pot is generated for git 1.8.1 l10n round 2

2012-11-29 Thread Jiang Xin
Hi, New "git.pot" is generated from v1.8.0.1-347-gf94c3 in the master branch. l10n: Update git.pot (5 new, 1 removed messages) L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3. Signed-off-by: Jiang Xin This update is for the l10n of upcoming git 1.8.1. You

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-29 Thread Viresh Kumar
On 30 November 2012 09:03, Nicolas Pitre wrote: > Have a look at the .mailmap file in the top directory of your repo. Repeating what i said to David in other mail: I have my name there :) I thought using names with different case is actually different then misspelling it. And so, everybody mus

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-29 Thread Nicolas Pitre
On Fri, 30 Nov 2012, viresh kumar wrote: > Hi Junio and others, > > I have a query. git shortlog lists the patches submitted per commiter, like: > > > Viresh Kumar (7): > > cpufreq: Improve debug prints > > cpufreq: return early from __cpufreq_driver_getavg() > > cpufreq: gover

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-29 Thread Viresh Kumar
On 30 November 2012 08:54, David Aguilar wrote: > There's a feature that does exactly this. > > http://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html > > See the section called "Mapping Authors". > It discusses the .mailmap file. I have my name there :) I thought using names with dif

Re: [Query] Can we ignore case for commiters name in shortlog?

2012-11-29 Thread David Aguilar
On Thu, Nov 29, 2012 at 6:09 PM, viresh kumar wrote: > Hi Junio and others, > > I have a query. git shortlog lists the patches submitted per commiter, like: > >> Viresh Kumar (7): >> cpufreq: Improve debug prints >> cpufreq: return early from __cpufreq_driver_getavg() >> cpufreq:

Re: [PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-11-29 Thread W. Trevor King
On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote: > On Thu, Nov 29, 2012 at 2:13 PM, W. Trevor King wrote: > > On Thu, Nov 29, 2012 at 01:29:12PM -0500, Phil Hord wrote: > >> For that reason, I don't like the --pull switch since it implies a > >> fetch, but I will not always want to do a

[Query] Can we ignore case for commiters name in shortlog?

2012-11-29 Thread viresh kumar
Hi Junio and others, I have a query. git shortlog lists the patches submitted per commiter, like: > Viresh Kumar (7): > cpufreq: Improve debug prints > cpufreq: return early from __cpufreq_driver_getavg() > cpufreq: governors: remove redundant code > cpufreq: Fix sparse wa

[PATCH v6 6/8] push: require force for annotated tags

2012-11-29 Thread Chris Rorvick
Do not allow fast-forwarding of references that point to a tag object. Updating from a tag is potentially destructive since it would likely leave the tag dangling. Disallowing updates to a tag also makes sense semantically and is consistent with the behavior of lightweight tags. Signed-off-by: Ch

[PATCH v6 8/8] push: cleanup push rules comment

2012-11-29 Thread Chris Rorvick
Rewrite to remove inter-dependencies amongst the rules. Signed-off-by: Chris Rorvick --- remote.c | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/remote.c b/remote.c index ee0c1e5..6309a87 100644 --- a/remote.c +++ b/remote.c @@ -1319,27 +13

[PATCH v6 7/8] push: clarify rejection of update to non-commit-ish

2012-11-29 Thread Chris Rorvick
Pushes must already (by default) update to a commit-ish due to the fast- forward check in set_ref_status_for_push(). But rejecting for not being a fast-forward suggests the situation can be resolved with a merge. Flag these updates (i.e., to a blob or a tree) as not forwardable so the user is pres

[PATCH v6 4/8] push: flag updates that require force

2012-11-29 Thread Chris Rorvick
Add a flag for indicating an update to a reference requires force. Currently the `nonfastforward` flag is used for this when generating the status message. A separate flag insulates dependent logic from the details of set_ref_status_for_push(). Signed-off-by: Chris Rorvick --- cache.h | 4

[PATCH v6 5/8] push: require force for refs under refs/tags/

2012-11-29 Thread Chris Rorvick
References are allowed to update from one commit-ish to another if the former is an ancestor of the latter. This behavior is oriented to branches which are expected to move with commits. Tag references are expected to be static in a repository, though, thus an update to something under refs/tags/

[PATCH v6 3/8] push: flag updates

2012-11-29 Thread Chris Rorvick
If the reference exists on the remote and it is not being removed, then mark as an update. This is in preparation for handling tags (lightweight and annotated) exceptionally. Signed-off-by: Chris Rorvick --- cache.h | 1 + remote.c | 18 +++--- 2 files changed, 12 insertions(+), 7

[PATCH v6 2/8] push: add advice for rejected tag reference

2012-11-29 Thread Chris Rorvick
Advising the user to fetch and merge only makes sense if the rejected reference is a branch. If none of the rejections are for branches, just tell the user the reference already exists. Signed-off-by: Chris Rorvick --- builtin/push.c | 11 +++ cache.h| 1 + remote.c | 10

[PATCH v6 0/8] push: update remote tags only with force

2012-11-29 Thread Chris Rorvick
This patch series originated in response to the following thread: http://thread.gmane.org/gmane.comp.version-control.git/208354 I made some adjustments based on Junio's last round of feedback including a new patch reworking the "push rules" comment in remote.c. Also refined some of the log mess

[PATCH v6 1/8] push: return reject reasons as a bitset

2012-11-29 Thread Chris Rorvick
Pass all rejection reasons back from transport_push(). The logic is simpler and more flexible with regard to providing useful feedback. Signed-off-by: Chris Rorvick --- builtin/push.c | 13 - builtin/send-pack.c | 4 ++-- transport.c | 17 - transport.h

Re: [PATCH] cache-tree: invalidate i-t-a paths after writing trees

2012-11-29 Thread Nguyen Thai Ngoc Duy
On Fri, Nov 30, 2012 at 7:06 AM, Junio C Hamano wrote: > Nguyen Thai Ngoc Duy writes: > >>> An alternative might be to add a "phoney" bit next to "used" in the >>> cache_tree structure, mark the cache tree as phoney when we skip an >>> entry marked as CE_REMOVE or CE_ITA, and make the postprocess

Re: [PATCH] gitweb: add readme to overview page

2012-11-29 Thread Xypron
The following setting provides the same feature # html text to include at home page $home_text = "indextext.html"; Sorry for the noise. Best regards Heinrich Schuchardt On 29.11.2012 23:30, Xypron wrote: > Hello Junio, > > thank you for your comment in message > <7vip9ak971@alter.siamese.

Re: [PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-11-29 Thread Phil Hord
On Thu, Nov 29, 2012 at 2:13 PM, W. Trevor King wrote: > > On Thu, Nov 29, 2012 at 01:29:12PM -0500, Phil Hord wrote: >> On Fri, Nov 23, 2012 at 12:54 PM, W. Trevor King wrote: >> > [snip initial thoughts leading to the update --remote v5] >> >> I was thinking the same thing, but reading this who

Re: [PATCH] cache-tree: invalidate i-t-a paths after writing trees

2012-11-29 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: >> An alternative might be to add a "phoney" bit next to "used" in the >> cache_tree structure, mark the cache tree as phoney when we skip an >> entry marked as CE_REMOVE or CE_ITA, and make the postprocessing >> loop this patch adds aware of that bit, instead of iter

Re: [PATCH 6/8] imap-send: change msg_data from storing (char *, len) to storing strbuf

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 01:30:54PM -0800, Junio C Hamano wrote: > > For some reason, there is a bunch of infrastructure in this file for > > dealing with IMAP flags, although there is nothing in the code that > > actually allows any flags to be set. If there is no plan to add > > support for flag

What's cooking in git.git (Nov 2012, #10; Thu, 29)

2012-11-29 Thread Junio C Hamano
What's cooking in git.git (Nov 2012, #10; Thu, 29) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Hopefully 1.8.1-rc0 preview will be tagge

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-29 Thread Thomas Rast
Hi Ralf Here is the final third of my review. > #: builtin/prune-packed.c:7 > msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" > -msgstr "" > +msgstr "git prune-packed [-n|--dry-run] [-q|--quite]" ^ typo at the far end > #: builtin/prun

Re: [PATCH] gitweb: add readme to overview page

2012-11-29 Thread Xypron
Hello Junio, thank you for your comment in message <7vip9ak971@alter.siamese.dyndns.org> that message <1352652039-31453-1-git-send-email-xypron.g...@gmx.de> lost the thread context. As already described I would be happy if a README.html could be added to the overview page of gitweb. Please,

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Martin von Zweigbergk
On Thu, Nov 29, 2012 at 11:13 AM, Junio C Hamano wrote: > [...]These > two commands, "reset" and "checkout", share that the source we grab > the blobs out of only need to be a tree and does not have to be a > commit, and the only difference between them is where the blobs we > grabbed out of that

Re: [PATCH 0/8] Add function strbuf_addstr_xml_quoted() and more

2012-11-29 Thread Junio C Hamano
Michael Haggerty writes: > There were two functions doing almost the same XML quoting of > character entities, so implement a library function > strbuf_addstr_xml_quoted() and use that in both places. > > Along the way, do a lot of simplification within imap-send.c, which > was doing a lot of its

Re: [PATCH 6/8] imap-send: change msg_data from storing (char *, len) to storing strbuf

2012-11-29 Thread Junio C Hamano
Michael Haggerty writes: > struct msg_data stored (char *, len) of the data to be included in a That (, ) is a bit funny notation, even though it is understandable. > message, kept the character data NUL-terminated, etc., much like a > strbuf would do. So change it to use a struct strbuf. Thi

Re: [PATCH] gitweb: git_summary - show $project in title

2012-11-29 Thread Xypron
Thank you for your comments. In the appended version of the patch the project title is escaped: Subject: [PATCH] gitweb: git_summary - show $project in title Gitweb pages are structured by divs of class title with grey background. The shortlog, and the log page show the project name as the first

Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: >> ... >> The hunks in the patch look fine. The last one that tests unmerged >> entries do not have to have "chmod" if it gives you trouble (you >> would need to reduce number of files from 4 to 3 if you go that >> route, I think). > > That is, so

Re: Millisecond precision in timestamps?

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 02:14:40PM -0500, Phil Hord wrote: > > And if we were to add "committer-timestamp" and friends to support > > negative timestamps anyway (because older tools will not support > > them), supporting sub-second part might be something we want to > > think about at the same tim

Re: [PATCH 1/2 v3] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 11:33:19AM -0800, Junio C Hamano wrote: > > diff --git a/Documentation/git-fast-import.txt > > b/Documentation/git-fast-import.txt > > index 959e4d3..d1844ea 100644 > > --- a/Documentation/git-fast-import.txt > > +++ b/Documentation/git-fast-import.txt > > @@ -562,8 +562,1

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Junio C Hamano
Martin von Zweigbergk writes: > Would the correct fix be to > first make "git reset --hard -- $path" work (*sigh*)? I have never > understood why that doesn't (shouldn't) work. What does it even mean, even when you are on an existing commit, to hard reset partially? Perhaps you looking for "git

Re: [PATCH 1/2 v3] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Junio C Hamano
Matthieu Moy writes: > The documentation mentionned only newlines and double quotes as > characters needing escaping, but the backslash also needs it. Also, the > documentation was not clearly saying that double quotes around the file > name were required (double quotes in the examples could be i

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 11:15:56AM -0800, Junio C Hamano wrote: > >> -If an `LF` or double quote must be encoded into `` shell-style > >> -quoting should be used, e.g. `"path/with\n and \" in it"`. > >> +If an `LF`, backslash or double quote must be encoded into `` > >> +shell-style quoting should

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Junio C Hamano
Jeff King writes: > On Thu, Nov 29, 2012 at 06:00:54PM +0100, Matthieu Moy wrote: > >> The documentation mentionned only newlines and double quotes as > > s/nn/n/ > >> diff --git a/Documentation/git-fast-import.txt >> b/Documentation/git-fast-import.txt >> index 6603a7a..35b909c 100644 >> --- a/

Re: Millisecond precision in timestamps?

2012-11-29 Thread Phil Hord
On Wed, Nov 28, 2012 at 2:29 AM, Junio C Hamano wrote: > Jeff King writes: > >> There is room for new headers, and older versions of git will ignore >> them. You could add a new "committer-timestamp" field that elaborates on >> the timestamp included on the committer line. Newer versions of git >

Re: [PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-11-29 Thread W. Trevor King
On Thu, Nov 29, 2012 at 01:29:12PM -0500, Phil Hord wrote: > On Fri, Nov 23, 2012 at 12:54 PM, W. Trevor King wrote: > > [snip initial thoughts leading to the update --remote v5] > > I was thinking the same thing, but reading this whole thread a couple of > weeks late. Thanks for noticing. > >

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Junio C Hamano
Junio C Hamano writes: > Martin von Zweigbergk writes: > >> In cases where HEAD is not supposed to be updated, there is no reason >> that "git reset" should require a commit, a tree should be enough. So >> make "git reset $rev^{tree}" work just like "git reset $rev", except >> that the former wi

[PATCH 2/2 v3] git-remote-mediawiki: escape ", \, and LF in file names

2012-11-29 Thread Matthieu Moy
A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy --- contrib/mw-to-git

[PATCH 1/2 v3] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Matthieu Moy
The documentation mentionned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sente

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Martin von Zweigbergk
On Thu, Nov 29, 2012 at 10:47 AM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >> In cases where HEAD is not supposed to be updated, there is no reason >> that "git reset" should require a commit, a tree should be enough. So >> make "git reset $rev^{tree}" work just like "git reset $re

Re: Millisecond precision in timestamps?

2012-11-29 Thread Eric S. Raymond
Junio C Hamano : > That is exactly why I said it is all relative. If it helps your > application, you can weigh the pros-and-cons yourself and choose to > throw "junk" extended header fields in the commit objects you > create, using hash-object (or commit-tree). You can read it out > using cat-fi

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 07:47:32PM +0100, Matthieu Moy wrote: > Jeff King writes: > > > So technically, your modification to the beginning of the sentence is > > not correct. > > I'd say the resulting sentence is somehow incorrect, but not more than > the previous one (both say "if ..." without

Re: Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option

2012-11-29 Thread Phil Hord
On Tue, Nov 27, 2012 at 6:28 PM, Heiko Voigt wrote: > > Hi, > > On Tue, Nov 27, 2012 at 02:01:05PM -0500, W. Trevor King wrote: > > On Tue, Nov 27, 2012 at 07:31:25PM +0100, Heiko Voigt wrote: > > The v4 series leaves the remote branch amigious, but it helps you > > point the local branch at the r

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Matthieu Moy
Jeff King writes: > So technically, your modification to the beginning of the sentence is > not correct. I'd say the resulting sentence is somehow incorrect, but not more than the previous one (both say "if ..." without really telling what the condition was). >> If an `LF`, backslash or double

Re: [RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Junio C Hamano
Martin von Zweigbergk writes: > In cases where HEAD is not supposed to be updated, there is no reason > that "git reset" should require a commit, a tree should be enough. So > make "git reset $rev^{tree}" work just like "git reset $rev", except > that the former will not update HEAD (since there

[RFC/PATCH 1/2] reset: learn to reset to tree

2012-11-29 Thread Martin von Zweigbergk
In cases where HEAD is not supposed to be updated, there is no reason that "git reset" should require a commit, a tree should be enough. So make "git reset $rev^{tree}" work just like "git reset $rev", except that the former will not update HEAD (since there is no commit to point it to). Disallow

[RFC/PATCH 0/2] Fix "git reset" on unborn branch

2012-11-29 Thread Martin von Zweigbergk
I decided to address this before "cherry-pick on unborn branch". RFC mostly because I'm not sure about the user interface. When we have agreed on that, I will add documentation. Martin von Zweigbergk (2): reset: learn to reset to tree reset: learn to reset on unborn branch builtin/reset.c

[RFC/PATCH 2/2] reset: learn to reset on unborn branch

2012-11-29 Thread Martin von Zweigbergk
When run on an unborn branch, "git reset" currently fails with: fatal: Failed to resolve 'HEAD' as a valid ref. Fix this by interpreting it as a reset to the empty tree. If --patch is given, we currently pass the revision specifier, as given on the command line, to interactive_reset(). On an u

Re: Ubuntu: gitweb always looks for projects in /var/cache/git (“404 - no projects found”)

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 01:55:57PM +, Alfonso Muñoz-Pomer Fuentes wrote: > I’ve discovered this weird behaviour in gitweb and documented a workaround in > StackOverflow: > http://stackoverflow.com/questions/13609475/ubuntu-gitweb-always-looks-for-projects-in-var-cache-git-404-no-projects-f >

Re: [PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Jeff King
On Thu, Nov 29, 2012 at 06:00:54PM +0100, Matthieu Moy wrote: > The documentation mentionned only newlines and double quotes as s/nn/n/ > diff --git a/Documentation/git-fast-import.txt > b/Documentation/git-fast-import.txt > index 6603a7a..35b909c 100644 > --- a/Documentation/git-fast-import.tx

Re: [PATCH] completion: fix warning for zsh

2012-11-29 Thread Junio C Hamano
Will apply directly on 'master'; thanks. -- 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

Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Sixt writes: > >>> It turns out that there are at least two bugs in the diffstat >>> counting code. This series comes on top of the earlier 74faaa1 (Fix >>> "git diff --stat" for interesting - but empty - file changes, >>> 2012-10-17) to fix them. >> >> The tes

Re: [PATCH v2] If `egrep` is aliased, temporary disable it in bash.completion

2012-11-29 Thread Junio C Hamano
Junio C Hamano writes: > Adam Tkac writes: > >> Subject: Re: [PATCH v2] If `egrep` is aliased, temporary disable it in >> bash.completion > > The code does not seem to do anything special if it is not aliased, > though, so "If ..." part does not sound correct; perhaps you meant > "just in case

[StGit PATCH] Include emacs and vim contribs in source tarball

2012-11-29 Thread Zane Bitter
This will enable downstream distros to package them. Signed-off-by: Zane Bitter --- MANIFEST.in |3 +++ 1 file changed, 3 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index c94eef6..a80f013 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,6 +9,9 @@ include examples/gitconfig includ

Re: [PATCH v2] If `egrep` is aliased, temporary disable it in bash.completion

2012-11-29 Thread Junio C Hamano
Adam Tkac writes: > Subject: Re: [PATCH v2] If `egrep` is aliased, temporary disable it in > bash.completion The code does not seem to do anything special if it is not aliased, though, so "If ..." part does not sound correct; perhaps you meant "just in case egrep is aliased to something totally

[PATCH 1/2] git-fast-import.txt: improve documentation for quoted paths

2012-11-29 Thread Matthieu Moy
The documentation mentionned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sente

[PATCH 2/2 v2] git-remote-mediawiki: escape ", \, and LF in file names

2012-11-29 Thread Matthieu Moy
A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy --- contrib/mw-to-git

Re: [PATCH] git-remote-mediawiki: escape double quotes and LF in file names

2012-11-29 Thread Matthieu Moy
Junio C Hamano writes: >> +sub fe_escape_path { >> +my $path = shift; >> +$path =~ s/"/\\"/g; >> +$path =~ s/\n/\\n/g; >> +return $path; >> +} > > Is this sufficient? > > My reading of the big comment at the beginning of fast-import.c is > that you would also want to quote each ba

Re: Millisecond precision in timestamps?

2012-11-29 Thread Junio C Hamano
"Eric S. Raymond" writes: > Felipe Contreras : >> On Thu, Nov 29, 2012 at 8:11 AM, Junio C Hamano wrote: >> > Steven Michalske writes: >> > >> >> Would having arbitrary key value pairs be useful in the git data >> >> model? >> > >> > My answer to the question is that it is harmful to the data m

Re: [RFC] git-submodule update: Add --commit option

2012-11-29 Thread W. Trevor King
On Thu, Nov 29, 2012 at 11:12:16AM -0500, W. Trevor King wrote: > + test "$(git log -1 --oneline)" = "bbdbe2d Updated submodules: > submodule" s/bbdbe2d/cd69713/ I forgot to update the SHA-1 here after tweaking the commit message format. I'd like to rewrite this test so it won't use the SH

Re: [PATCH] git-remote-mediawiki: escape double quotes and LF in file names

2012-11-29 Thread Junio C Hamano
Matthieu Moy writes: > A mediawiki page can contain, and even start with a " character, we have > to escape it when generating the fast-export stream. While we're there, > also escape newlines, but I don't think we can get them from MediaWiki > pages. > > Signed-off-by: Matthieu Moy > --- > con

Re: [RFC] git-submodule update: Add --commit option

2012-11-29 Thread W. Trevor King
On Thu, Nov 29, 2012 at 11:12:16AM -0500, W. Trevor King wrote: > + test "a" = "b" This kills the test (with --immediate) so you can look at the generated commit. If you actually want the test to pass (e.g. if this becomes a PATCH and not an RFC), this line should be removed. -- This email may

Re: [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Junio C Hamano
Johannes Sixt writes: >> It turns out that there are at least two bugs in the diffstat >> counting code. This series comes on top of the earlier 74faaa1 (Fix >> "git diff --stat" for interesting - but empty - file changes, >> 2012-10-17) to fix them. > > The tests still fail on Windows. I am not

[RFC] git-submodule update: Add --commit option

2012-11-29 Thread W. Trevor King
This option triggers automatic commits when `submodule update` changes any gitlinked submodule SHA-1s. The commit message contains a `shortlog` summary of the changes for each changed submodule. --- On Tue, Nov 27, 2012 at 07:51:42PM +0100, Heiko Voigt wrote: > BTW, I am more and more convinced t

[PATCH] DESTDIR support in contrib/subtree/Makefile

2012-11-29 Thread Adam Tkac
Signed-off-by: Adam Tkac --- It is a good habit in Makefiles to honor DESTDIR variable to support `make DESTDIR=/instalroot install` syntax. Comments are welcomed. Regards, Adam contrib/subtree/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree/

[PATCH v2] If `egrep` is aliased, temporary disable it in bash.completion

2012-11-29 Thread Adam Tkac
Originally reported as https://bugzilla.redhat.com/show_bug.cgi?id=863780 Signed-off-by: Adam Tkac Signed-off-by: Holger Arnold --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/comple

gitk: highlighting commits "touching path" with globs doesn't work for files list

2012-11-29 Thread Yaroslav Halchenko
Hi GIT Gurus, Highlighting files (in patch view) and commits which modified those files is a really nice feature to have. Often it is needed to highlight based on a glob expression for files, e.g. '*Makefile*' -- that seems to highlight the commits but files in the patch view are no longer highl

AW: reposurgeon now writes Subversion repositories

2012-11-29 Thread Markus Schaber
Hi, Von: Eric S. Raymond [mailto:e...@thyrsus.com] > > How does reposurgeon handle empty directories with (node) properties? > > Currently by ignoring all of them except svn:ignore, which it turns > into .gitignore content on the gitspace side. And now vice-versa, too. > > Not clear what else i

Re: git describe not matching git log

2012-11-29 Thread Michael J Gruber
Steven Penny venit, vidit, dixit 29.11.2012 10:04: > It seems "git describe" is not matching "git log" as detailed in the help, in > some cases. From git describe --help > > [torvalds@g5 git]$ git describe parent > v1.0.4-14-g2414721 > > The number of additional commits is the number of com

Re: reposurgeon now writes Subversion repositories

2012-11-29 Thread Eric S. Raymond
Daniel Shahaf : > I don't see the kludge here --- git has a "author" != "committer" > distinction, svn doesn't, so if you want to grow that distinction the > most natural way is a new property. Storing additional information in > svn:author is a separate issue. See my advocacy to Branko of going

Re: reposurgeon now writes Subversion repositories

2012-11-29 Thread Daniel Shahaf
(note, other half of the thread is on dev@svn only..) Eric S. Raymond wrote on Thu, Nov 29, 2012 at 06:46:37 -0500: > Daniel Shahaf : > > You might also seek community consensus to reserve an svn:foo name for > > the "original author" property --- perhaps svn:original-author --- so > > that reposu

[PATCH] git-remote-mediawiki: escape double quotes and LF in file names

2012-11-29 Thread Matthieu Moy
A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki |

Re: reposurgeon now writes Subversion repositories

2012-11-29 Thread Eric S. Raymond
Daniel Shahaf : > > Subversion's metadata doesn't have separate author and committer > > properties, and doesn't store anything but a Unix user ID as > > attribution. I don't see any way around this. > > You're not fully informed, then. > > 1) svn:author revprops can contain any UTF-8 string. T

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-29 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 28.11.2012 19:22: >> Hi Ralf, >> >> This is the middle third of my review. Sorry for the long wait! I hope >> it can still be useful. >> > > Hi Thomas, > > no problem. Thanks for your review. Of course it's very useful. > Some of the mistakes I made are so obvio

Re: Millisecond precision in timestamps?

2012-11-29 Thread Eric S. Raymond
Felipe Contreras : > On Thu, Nov 29, 2012 at 8:11 AM, Junio C Hamano wrote: > > Steven Michalske writes: > > > >> Would having arbitrary key value pairs be useful in the git data > >> model? > > > > My answer to the question is that it is harmful to the data model, > > but the benefit of going ag

Re: reposurgeon now writes Subversion repositories

2012-11-29 Thread Branko Čibej
On 29.11.2012 08:58, Daniel Shahaf wrote: > I think you're saying that adds might turn into copies, and > vice-versa. That is something users would notice --- it is certainly > exposed in the UI --- even though node-id's are not exposed to clients. ... yet. But there are plans underway to expose

Re: Please pull l10n updates for 1.8.1 round 1

2012-11-29 Thread Jiang Xin
Hi, New pull request with updates on Vietnamese for git 1.8.1 from Tran: The following changes since commit 2d242fb3fc19fc9ba046accdd9210be8b9913f64: Update draft release notes for 1.8.1 (2012-11-21 13:32:58 -0800) are available in the git repository at: git://github.com/git-l10n/git-po m

[PATCH] t4049: avoid test failures on filemode challenged file systems (Windows)

2012-11-29 Thread Johannes Sixt
From: Johannes Sixt The earlier change 74faaa16 (Fix "git diff --stat" for interesting - but empty - file changes) needed to change the count of differing files because the executable-bit changes of two empty files are now counted. On file systems that do not record the executable bit, however,

[PATCH] completion: fix warning for zsh

2012-11-29 Thread Felipe Contreras
Otherwise the user might get something like: git-completion.sh:2466: command not found: compdef If this script is loaded before compinit. The script would work either way, but let's not be more annoying to the user. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash |

Re: reposurgeon now writes Subversion repositories

2012-11-29 Thread Daniel Shahaf
Eric S. Raymond wrote on Thu, Nov 29, 2012 at 00:59:45 -0500: > In summary, Subversion repository histories do not round-trip through > reposurgeon editing. File content changes are preserved but some > metadata is unavoidably lost. Furthermore, writing out a DVCS history > in Subversion a

tiffany uk - The Engagement ring Women Dream about

2012-11-29 Thread kittycater65
The name connected with [url=http://www.tiffanyandcoringsoutlet.co.uk/]tiffany uk[/url] truly would mean status and comfort. And, that is exactly what provides them web site demand such high prices for their rings. Keep in the mind that when buying a Tiffany call, that the Tiffany look and br