Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-20 Thread David Aguilar
On Wed, Dec 19, 2012 at 10:28 PM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David

Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-20 Thread Joachim Schmitz
Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David Aguilar dav...@gmail.com --- I consider this a final

Re: [PATCH 3/3] Convert all fnmatch() calls to wildmatch()

2012-12-20 Thread Nguyen Thai Ngoc Duy
On Thu, Dec 20, 2012 at 1:36 AM, Junio C Hamano gits...@pobox.com wrote: @@ -627,7 +628,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry, return entry_interesting; if (item-use_wildcard) { -

Re: [PATCH 2/3] wildmatch: support no FNM_PATHNAME mode

2012-12-20 Thread Nguyen Thai Ngoc Duy
On Thu, Dec 20, 2012 at 8:55 AM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: As long as simpler patterns fnmatch() groks (namely, '?', '*', and '[class]' wildcards only) are not slowed down by replacing it with wildmatch(), that is, of course. I'm concerned about performance vs fnmatch too.

Gitweb running as FCGI does not print its output in UTF-8

2012-12-20 Thread Sergio Talens-Oliag
Hello, I'm sending this message to explain a problem I've found with gitweb.cgi when running it using a call like the following: export FCGI_SOCKET_PATH=/run/gitweb.socket gitweb.cgi --fcgi --nproc 2 I've fixed the problem for my installation usign a wrapper script, as explained below.

[PATCH] Python scripts audited for minimum compatible version and checks added.

2012-12-20 Thread Eric S. Raymond
Signed-off-by: Eric S. Raymond e...@thyrsus.com --- contrib/ciabot/ciabot.py | 5 + contrib/fast-import/import-zips.py | 5 + contrib/hg-to-git/hg-to-git.py | 5 + contrib/p4import/git-p4import.py | 5 + contrib/svn-fe/svnrdump_sim.py | 4 git-p4.py

Python version auditing followup

2012-12-20 Thread Eric S. Raymond
Most of the Python scripts in the distribution are small and simple to audit, so I am pretty sure of the results. The only place where I have a concern is the git_helpers library; that is somewhat more complex and I might have missed a dependency somewhere. Whoever owns that should check my

Re: [PATCH] Python scripts audited for minimum compatible version and checks added.

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 09:13:37AM -0500, Eric S. Raymond wrote: diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py index bd24395..b55648f 100755 --- a/contrib/ciabot/ciabot.py +++ b/contrib/ciabot/ciabot.py @@ -50,6 +50,11 @@ import os, sys, commands, socket, urllib from

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Jeff King
On Mon, Dec 17, 2012 at 01:05:38AM +, Adam Spiers wrote: t/t9902-completion.sh is currently failing for me because I happen to have a custom shell-script called git-check-email in ~/bin, which is on my $PATH. This is different to a similar-looking case reported recently, which was due to

Re: What's cooking in git.git (Dec 2012, #05; Tue, 18)

2012-12-20 Thread Jeff King
On Tue, Dec 18, 2012 at 12:31:43PM -0800, Junio C Hamano wrote: * jk/error-const-return (2012-12-15) 2 commits - silence some -Wuninitialized false positives - make error()'s constant return value more visible Help compilers' flow analysis by making it more explicit that error() always

Re: [PATCH] Python scripts audited for minimum compatible version and checks added.

2012-12-20 Thread Eric S. Raymond
Jeff King p...@peff.net: On Thu, Dec 20, 2012 at 09:13:37AM -0500, Eric S. Raymond wrote: diff --git a/contrib/ciabot/ciabot.py b/contrib/ciabot/ciabot.py index bd24395..b55648f 100755 --- a/contrib/ciabot/ciabot.py +++ b/contrib/ciabot/ciabot.py @@ -50,6 +50,11 @@ import os, sys,

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Jeff King
On Mon, Dec 17, 2012 at 12:35:54PM +0100, Toralf Förster wrote: often the output is requested in help forums - and a git config -l | wgetpaste exposes parameters like sendmail.smtppass - so hide those variables in the output (if not explicitly wanted) would makes sense, or ? But if we change

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Adam Spiers
On Thu, Dec 20, 2012 at 2:55 PM, Jeff King p...@peff.net wrote: On Mon, Dec 17, 2012 at 01:05:38AM +, Adam Spiers wrote: t/t9902-completion.sh is currently failing for me because I happen to have a custom shell-script called git-check-email in ~/bin, which is on my $PATH. This is

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Jeff King
On Sun, Dec 16, 2012 at 07:01:56PM +, Adam Spiers wrote: On Sun, Dec 16, 2012 at 6:54 PM, Junio C Hamano gits...@pobox.com wrote: Adam Spiers g...@adamspiers.org writes: This series of commits attempts to make test output coloring more intuitive,... Thanks; I understand that this

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Adam Spiers
On Thu, Dec 20, 2012 at 3:34 PM, Jeff King p...@peff.net wrote: On Sun, Dec 16, 2012 at 07:01:56PM +, Adam Spiers wrote: On Sun, Dec 16, 2012 at 6:54 PM, Junio C Hamano gits...@pobox.com wrote: Adam Spiers g...@adamspiers.org writes: This series of commits attempts to make test output

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Aaron Schrab
At 10:04 -0500 20 Dec 2012, Jeff King p...@peff.net wrote: The problem seems to be that people are giving bad advice to tell people to post git config -l output without looking at. Maybe we could help them with a git config --share-config option that dumps all config, but sanitizes the output.

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Michael Haggerty
On 12/20/2012 04:04 PM, Jeff King wrote: On Mon, Dec 17, 2012 at 12:35:54PM +0100, Toralf Förster wrote: often the output is requested in help forums - and a git config -l | wgetpaste exposes parameters like sendmail.smtppass - so hide those variables in the output (if not explicitly wanted)

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 10:49:15AM -0500, Aaron Schrab wrote: At 10:04 -0500 20 Dec 2012, Jeff King p...@peff.net wrote: The problem seems to be that people are giving bad advice to tell people to post git config -l output without looking at. Maybe we could help them with a git config

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 04:51:37PM +0100, Michael Haggerty wrote: The problem seems to be that people are giving bad advice to tell people to post git config -l output without looking at. Maybe we could help them with a git config --share-config option that dumps all config, but sanitizes

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 03:44:53PM +, Adam Spiers wrote: diff --git a/t/test-lib.sh b/t/test-lib.sh index 256f1c6..31f59af 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -227,7 +227,7 @@ then pass) tput setaf 2;;# green

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Toralf Förster
yep - understood On 12/20/2012 04:49 PM, Aaron Schrab wrote: At 10:04 -0500 20 Dec 2012, Jeff King p...@peff.net wrote: The problem seems to be that people are giving bad advice to tell people to post git config -l output without looking at. Maybe we could help them with a git config

Re: [RFC] test: Old shells and physical paths

2012-12-20 Thread David Michael
Hi, On Thu, Dec 20, 2012 at 12:01 AM, David Aguilar dav...@gmail.com wrote: Do you know if the differences are relegated to cd, or do other common commands such as awk, grep, sed, mktemp, expr, etc. have similar issues? There are almost certainly going to be incompatibilities with other

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Torsten Bögershausen
On 20.12.12 16:13, Adam Spiers wrote: On Thu, Dec 20, 2012 at 2:55 PM, Jeff King p...@peff.net wrote: On Mon, Dec 17, 2012 at 01:05:38AM +, Adam Spiers wrote: t/t9902-completion.sh is currently failing for me because I happen to have a custom shell-script called git-check-email in ~/bin,

[PATCH] t9902: Be more specific when completing git-checkout

2012-12-20 Thread Torsten Bögershausen
t9902 is trying to complete e.g. git --version check into git --version checkout If there are other binaries like git-check-email or git-check-ignore in the PATH one test case failes By using checkou instead of check the test becomes more future proof. Signed-off-by: Torsten Bögershausen

Re: What's cooking in git.git (Dec 2012, #05; Tue, 18)

2012-12-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Dec 18, 2012 at 12:31:43PM -0800, Junio C Hamano wrote: * jk/error-const-return (2012-12-15) 2 commits - silence some -Wuninitialized false positives - make error()'s constant return value more visible Help compilers' flow analysis by making it

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Adam Spiers
On Thu, Dec 20, 2012 at 4:11 PM, Jeff King p...@peff.net wrote: On Thu, Dec 20, 2012 at 03:44:53PM +, Adam Spiers wrote: diff --git a/t/test-lib.sh b/t/test-lib.sh index 256f1c6..31f59af 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -227,7 +227,7 @@ then pass)

[PATCH] Highlight the link target line in Gitweb using CSS

2012-12-20 Thread Matthew Blissett
This is useful when a Gitweb link with a target (like #l100) refers to a line in the last screenful of text. Highlight the background in yellow, and display a ⚓ character on the left. Show the same highlight when hovering the mouse over a line number. Signed-off-by: Matthew Blissett

Re: [PATCH] Python scripts audited for minimum compatible version and checks added.

2012-12-20 Thread Junio C Hamano
Eric S. Raymond e...@thyrsus.com writes: Should the error message say ciabot.py? -Peff Gack. Yes. Thaty's what I get for cut-and-pasting too quickly. The information about xnml.sex is correct, though. Want me to resubmit, or will you just patch it? Can handle it myself; thanks for the

Re: Python version auditing followup

2012-12-20 Thread Junio C Hamano
e...@thyrsus.com (Eric S. Raymond) writes: That was the first of three patches I have promised. In order to do the next one, which will be a development guidelines recommend compatibility back to some specific version X, I need a policy decision. How do we set X? I don't think X can be

[PATCH] builtin/clean.c: Fix some sparse warnings

2012-12-20 Thread Ramsay Jones
Sparse issues two Using plain integer as NULL pointer warnings (lines 41 and 47). The first warning relates to the initializer expression in the declaration for the 'char *dir' variable. In order to suppress the warning, we simply replace the zero initializer with NULL. The second warning

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: 2. Loosen the test to look for the presence of checkout, but not fail when other items are present. Bonus points if it makes sure that everything returned starts with check. I think (2) is the ideal solution in terms of behavior, but writing it

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: Yeah. Thanks for a dose of sanity. I was really trying not to say the given advice is bad, and we cannot help those people. But I think you are right; the only sensible path is for the user to inspect the output before posting it. True. -- To unsubscribe from

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I think the problem is yet another step earlier: why do we build tools that encourage people to store passwords in plaintext in a configuration file that is by default world-readable? True. This particular one mentioned in the thread predates

Re: Q: do people compile with NO_FNMATCH on OpenBSD 5.2?

2012-12-20 Thread Greg Troxel
[mkstemp truncating output on error] diff --git c/wrapper.c w/wrapper.c index 68739aa..a066e2e 100644 --- c/wrapper.c +++ w/wrapper.c @@ -229,7 +229,7 @@ int xmkstemp(char *template) int saved_errno = errno; const char *nonrelative_template; -

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: Good point, I forgot to check what it looked like with -v. Since this series is already on v6, is there a more lightweight way of addressing this tiny tweak than sending v7? It is ultimately up to Junio, but I suspect he would be OK if you just reposted

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 11:21:09AM -0800, Junio C Hamano wrote: The expected_failure cases painted in warn are all long-known failures; I do not think reminding about them in bold over and over will help encouraging the developers take a look at them. The skipped cases fall into two

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: 2. Loosen the test to look for the presence of checkout, but not fail when other items are present. Bonus points if it makes sure that everything returned starts with check. I think (2) is the ideal

Re: What's cooking in git.git (Dec 2012, #05; Tue, 18)

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 10:13:37AM -0800, Junio C Hamano wrote: * jk/error-const-return (2012-12-15) 2 commits - silence some -Wuninitialized false positives - make error()'s constant return value more visible Help compilers' flow analysis by making it more explicit that error()

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 11:55:45AM -0800, Junio C Hamano wrote: The beginning of such a change may look like the attached patch. [...] +test_fully_contains () { + sort $1 expect.sorted + sort $2 actual.sorted + test $(comm -23 expect.sorted actual.sorted | wc -l) = 0 +} I

Re: [PATCH] oneway_merge(): only lstat() when told to update worktree

2012-12-20 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Although the subject line of 613f027 (read-tree -u one-way merge fix to check out locally modified paths., 2006-05-15) mentions read-tree -u, it did not seem to check whether -u was in effect. Not checking whether -u is in effect makes e.g.

Re: What's cooking in git.git (Dec 2012, #05; Tue, 18)

2012-12-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: So our attempt for more compile-time safety may actually introduce a run-time bug. And it is a hard bug to find, as the preprocessor magically converts the error code into -1 without you being able to see it in the code. It would be safer to just

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Torsten Bögershausen
On 20.12.12 21:01, Jeff King wrote: +test_fully_contains () { +sort $1 expect.sorted +sort $2 actual.sorted +test $(comm -23 expect.sorted actual.sorted | wc -l) = 0 +} (Good to learn about the comm command, thanks ) What do we think about this: diff --git

Re: [PATCH] Highlight the link target line in Gitweb using CSS

2012-12-20 Thread Junio C Hamano
[jc: adding area expert to Cc] Matthew Blissett m...@blissett.me.uk writes: This is useful when a Gitweb link with a target (like #l100) refers to a line in the last screenful of text. Highlight the background in yellow, and display a ⚓ character on the left. Show the same highlight when

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 20.12.12 21:01, Jeff King wrote: +test_fully_contains () { + sort $1 expect.sorted + sort $2 actual.sorted + test $(comm -23 expect.sorted actual.sorted | wc -l) = 0 +} (Good to learn about the comm command, thanks ) What do we think

Re: $PATH pollution and t9902-completion.sh

2012-12-20 Thread Jeff King
On Thu, Dec 20, 2012 at 09:53:06PM +0100, Torsten Bögershausen wrote: (Good to learn about the comm command, thanks ) What do we think about this: diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 3cd53f8..82eeba7 100755 --- a/t/t9902-completion.sh +++

Re: Python version auditing followup

2012-12-20 Thread Joachim Schmitz
Junio C Hamano wrote: e...@thyrsus.com (Eric S. Raymond) writes: That was the first of three patches I have promised. In order to do the next one, which will be a development guidelines recommend compatibility back to some specific version X, I need a policy decision. How do we set X? I

Re: Python version auditing followup

2012-12-20 Thread Junio C Hamano
Joachim Schmitz j...@schmitz-digital.de writes: Junio C Hamano wrote: I personally would think 2.6 is recent enough. Which platforms that are long-term-maintained by their vendors still pin their Python at 2.4.X? 2.4.6 was in 2008 that was source only, 2.4.4 was in late 2006 that was the

Change in cvsps maintainership, abd a --fast-export option

2012-12-20 Thread Eric S. Raymond
Earlier today David Mansfield handed off to me the cvsps project. This is the code used as an engine for reading CVS repositories by git-cvsimport. His reason (aside from general overwork and no longer having a strong interest on the code) is that I have added a --fast-export option to cvsps-3.0

Re: RFC: git config -l should not expose sensitive information

2012-12-20 Thread Andrew Ardill
On 21 December 2012 02:49, Aaron Schrab aa...@schrab.com wrote: Tools outside of the core git tree may add support for new config keys which are meant to contain sensitive information, and there would be no way for `git config` to know about those. I understand that we've come down mostly on

Re: [PATCH v6 0/7] make test output coloring more intuitive

2012-12-20 Thread Adam Spiers
On Thu, Dec 20, 2012 at 7:21 PM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Good point, I forgot to check what it looked like with -v. Since this series is already on v6, is there a more lightweight way of addressing this tiny tweak than sending v7? It is

Re: [PATCH] Documentation/git-clean: Document --force --force

2012-12-20 Thread Soren Brinkmann
Ping? On Thu, Dec 13, 2012 at 05:46:55PM -0800, Soren Brinkmann wrote: This patch documents the behavior of 'git clean' when encountering nested git repositories. Such repositories are only deleted if '-f' is passed twice to 'git clean'. Signed-off-by: Soren Brinkmann

Noob Question

2012-12-20 Thread awingnut
I have not used git yet but am planning to. I am trying to get my head around how it will work and the documentation I found so far is of modest help. I currently have a Java application developed using Eclipse on Windows. However, the project is located on a Linux shared drive which is my Eclipse

[PATCH] Documentation/git-update-index: caution about tree objects

2012-12-20 Thread Greg Troxel
While one can add tree objects to the index, this is not currently useful. Therefore, use git ls-tree -r as the example to be fed to --index-info. Add a section explaining about expected index contents. (Thanks to Junio for explaining this to me in August of 2011.) Signed-off-by: Greg Troxel

Re: Noob Question

2012-12-20 Thread Andrew Ardill
Hi! On 21 December 2012 12:07, awingnut wtriker@gmail.com wrote: My main questions center around the git repository and accessing it. The main thing you need to know is that you can work on your code base in the *exact* same way while using git. You don't *have* to change anything about how

Re: [PATCH] Documentation/git-update-index: caution about tree objects

2012-12-20 Thread Junio C Hamano
Greg Troxel g...@ir.bbn.com writes: While one can add tree objects to the index, this is not currently useful. Therefore, use git ls-tree -r as the example to be fed to --index-info. Add a section explaining about expected index contents. (Thanks to Junio for explaining this to me in August

Re: [PATCH] Documentation/git-clean: Document --force --force

2012-12-20 Thread Junio C Hamano
Soren Brinkmann soren.brinkm...@xilinx.com writes: Ping? I *think* it is a mistake for the command to remove a separate project repository within, with any number of -f, so I'd rather see a patch to fix it, instead of casting such a misbehaviour as a feature in stone by documenting it. I

[PATCH v7 0/7] coloring test output after traffic signal

2012-12-20 Thread Junio C Hamano
To conclude the bikeshedding discussion we had today, here is what I queued by squashing stuff into relevant patches, so that people can eyeball the result for the last time. Adam Spiers (7): tests: test number comes first in 'not ok $count - $message' tests: paint known breakages in yellow

[PATCH v7 1/7] tests: test number comes first in 'not ok $count - $message'

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org The old output to say not ok - 1 messsage was working by accident only because the test numbers are optional in TAP. Signed-off-by: Adam Spiers g...@adamspiers.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t-basic.sh | 4 ++-- t/test-lib.sh

[PATCH v7 2/7] tests: paint known breakages in yellow

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org Yellow seems a more appropriate color than bold green when considering the universal traffic lights coloring scheme, where green conveys the impression that everything's OK, and amber that something's not quite right. Likewise, change the color of the

[PATCH v7 3/7] tests: paint skipped tests in blue

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org Skipped tests indicate incomplete test coverage. Whilst this is not a test failure or other error, it's still not a complete success. Other testsuite related software like automake, autotest and prove seem to use blue for skipped tests, so let's follow

[PATCH v7 4/7] tests: change info messages from yellow/brown to cyan

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org Now that we've adopted a traffic lights coloring scheme, yellow is used for warning messages, so we need to re-color info messages to something less alarmist. Blue is a universal color for informational messages; however we are using that for skipped tests

[PATCH v7 5/7] tests: refactor mechanics of testing in a sub test-lib

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org This will allow us to test the test framework more thoroughly without disrupting the top-level test metrics. Signed-off-by: Adam Spiers g...@adamspiers.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t-basic.sh | 85

[PATCH v7 6/7] tests: test the test framework more thoroughly

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org Add 5 new full test suite runs each with a different number of passing/failing/broken/fixed tests, in order to ensure that the correct exit code and output are generated in each case. As before, these are run in a subdirectory to avoid disrupting the metrics

[PATCH v7 7/7] tests: paint unexpectedly fixed known breakages in bold red

2012-12-20 Thread Junio C Hamano
From: Adam Spiers g...@adamspiers.org Change color of unexpectedly fixed known breakages to bold red. An unexpectedly passing test indicates that the test code is somehow broken or out of sync with the code it is testing. Either way this is an error which is potentially as bad as a failing

Re: [PATCH] Python scripts audited for minimum compatible version and checks added.

2012-12-20 Thread Junio C Hamano
I needed something like this on top of it to get it pass t5800. diff --git a/git_remote_helpers/git/__init__.py b/git_remote_helpers/git/__init__.py index 776e891..5047fd4 100644 --- a/git_remote_helpers/git/__init__.py +++ b/git_remote_helpers/git/__init__.py @@ -1,3 +1,5 @@ +import sys + if

Thomas Sabo Deutschland

2012-12-20 Thread Jorence
Die Sammlung von Thomas Sabo Deutschland http://www.thomassaboschmuckkaufen.eu/ für den Herbst-Winter 2009 ist eine Wut unter den Liebhabern von Sterling Silber. Dieser Bereich hat seine Inspiration bilden die beliebte ikonische Puppe namens Barbie. Es war im Jahr 2009, dass Barbie das Alter

[PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-20 Thread David Aguilar
Use $TMPDIR when creating the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David Aguilar dav...@gmail.com --- No mktemp usage in this round. mergetools/p4merge | 27 +-- 1

RE: Python version auditing followup

2012-12-20 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Thursday, December 20, 2012 10:39 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Python version auditing followup Joachim Schmitz j...@schmitz-digital.de writes: Junio C Hamano wrote: I personally would think 2.6 is