Re: What's cooking in git.git (Dec 2012, #04; Sun, 16)

2012-12-18 Thread Joachim Schmitz
Matt Kraai wrote: Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very much appreciated---does your platform build fine when the inclusion of the file is removed from

tiffany jewellery launched a new series of luxury jewelry

2012-12-18 Thread lenna654
Caused the posh jewelry from excavations in nature to fight, really coming in contact with story of Tiffany colored treasures. inch Tiffany executive vice us president Jon King said, This year, the 175th loved-one's birthday of the birth of a time when

Re: What's cooking in git.git (Dec 2012, #04; Sun, 16)

2012-12-18 Thread Johannes Sixt
Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very much appreciated---does your platform build fine when the inclusion of the file is removed from git-compat-util.h?

Re: problem with BOINC repository and CR/LF

2012-12-18 Thread Toralf Förster
On 12/18/2012 10:55 AM, Toralf Förster wrote: failed test(s): t3600 t7508 fixed 0 success 8342 failed 8 broken 56 total 8528 ick forgot these : n22 /usr/portage/dev-vcs/git # grep -i ^not ok /tmp/git.log | grep -v TODO not ok - 15 Test that git rm -f fails if its rm fails not ok

Re: problem with BOINC repository and CR/LF

2012-12-18 Thread Toralf Förster
On 12/18/2012 02:56 AM, Andrew Ardill wrote: On 18 December 2012 03:01, Toralf Förster toralf.foers...@gmx.de wrote: On 12/17/2012 12:38 PM, Andrew Ardill wrote: On 17 December 2012 21:23, Toralf Förster toralf.foers...@gmx.de wrote: Hello, I'm faced with this situation :

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Yann Dirson
On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new commit based on an existing one.

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 12:00, schrieb Yann Dirson: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new

Re: problem with BOINC repository and CR/LF

2012-12-18 Thread Torsten Bögershausen
On 18.12.12 10:55, Toralf Förster wrote: On 12/18/2012 02:56 AM, Andrew Ardill wrote: On 18 December 2012 03:01, Toralf Förster toralf.foers...@gmx.de wrote: On 12/17/2012 12:38 PM, Andrew Ardill wrote: On 17 December 2012 21:23, Toralf Förster toralf.foers...@gmx.de wrote: Hello, I'm faced

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Thomas Rast
Johannes Sixt j.s...@viscovery.net writes: Am 12/18/2012 12:00, schrieb Yann Dirson: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Thomas Rast
Yann Dirson dir...@bertin.fr writes: +EXAMPLE +--- + +Replacements (and before them, grafts) are often used to replace the +parent list of a commit. Since commits are stored in a human-readable +format, you can in fact change any property using the following +recipe: +

Opera release Git-splitter, a sub-modularizing tool for Git

2012-12-18 Thread Yngve N. Pettersen (Developer Opera Software ASA)
Hello all, Today Opera Software released the Git-splitter, a small tool for sub-modularizing code in a git repo, with complete commit history, under the Apache 2.0 license. It's functionality is similar to git-subtree, but also include a command for reversing the process. The code is

[PATCH] Makefile: track TCLTK_PATH as it used to be tracked

2012-12-18 Thread Christian Couder
A long time ago, gitk used to live at the root of the git.git repository. In 62ba514 (Move gitk to its own subdirectory, 2007-11-17) it was moved to a subdirectory, but some code used to track TCLTK_PATH was left in the main Makefile instead of being moved to the new Makefile that was created in

Re: [PATCH v3 3/4] gitk-git/Makefile: track TCLTK_PATH as it used to be tracked

2012-12-18 Thread Christian Couder
From: Junio C Hamano gits...@pobox.com .gitignore | 1 - gitk-git/.gitignore | 2 ++ gitk-git/Makefile | 16 ++-- I'll apply the .gitignore part to my tree, but could you split the rest out and have Paul apply to his tree at git://ozlabs.org/~paulus/gitk.git

Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed

2012-12-18 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: On Wed, Nov 23, 2011 at 10:51 AM, Junio C Hamano gits...@pobox.com wrote: I am guilty of introducing git reset --soft HEAD^ before I invented commit --amend during v1.3.0 timeframe to solve the issue soft reset originally wanted to. I do

[PATCH v4 1/3] Makefile: remove tracking of TCLTK_PATH

2012-12-18 Thread Christian Couder
It looks like we are tracking the value of TCLTK_PATH in the main Makefile for no good reason. This patch removes the useless code used to do this tracking. Maybe this code should have been moved to gitk-git/Makefile by 62ba514 (Move gitk to its own subdirectory, 2007-11-17). A patch to do that

[PATCH v4 2/3] Makefile: detect when PYTHON_PATH changes

2012-12-18 Thread Christian Couder
When make is run, the python scripts are created from *.py files that are changed to use the python given by PYTHON_PATH. And PYTHON_PATH is set by default to /usr/bin/python on Linux. This is nice except when you run make another time setting a different PYTHON_PATH, because, as the python

[PATCH v4 3/3] Makefile: replace echo 1... with echo ...

2012-12-18 Thread Christian Couder
This is clearer to many people this way. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Makefile | 10 +- git-gui/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7db8445..e055c9a 100644 --- a/Makefile +++

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Jeff King
On Tue, Dec 18, 2012 at 02:41:57PM +0100, Yann Dirson wrote: I wouldn't even want a script -- we'd end up inventing a complicated command-line editor for what can simply be done by judicious use of an actual text editor. How about something like the following? Well, while it does the

Re: Proposal: create meaningful aliases for git reset's hard/soft/mixed

2012-12-18 Thread Jeff King
On Mon, Dec 17, 2012 at 10:34:07PM -0800, Martin von Zweigbergk wrote: On Wed, Nov 23, 2011 at 10:51 AM, Junio C Hamano gits...@pobox.com wrote: I am guilty of introducing git reset --soft HEAD^ before I invented commit --amend during v1.3.0 timeframe to solve the issue soft reset

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

2012-12-18 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 17/12/2012 20:42, Junio C Hamano ha scritto: [...] I am not sure how you would handle the last parameter to git mv, though. That is by definition a path that does not exist, i.e. cannot be completed. Right, the code should be changed. No

Re: problem with BOINC repository and CR/LF

2012-12-18 Thread Jeff King
On Tue, Dec 18, 2012 at 01:15:30PM +0100, Torsten Bögershausen wrote: I could re-produce the problem here: git version 1.8.0.197.g5a90748 Mac OS X (that what I had at hands fastest) I could reproduce it, too, on Linux. The reason it does not always happen is that git will not re-examine the

sys/param.h

2012-12-18 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very much appreciated---does your platform build fine when the inclusion of the

Re: [PATCH] Makefile: track TCLTK_PATH as it used to be tracked

2012-12-18 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: A long time ago, gitk used to live at the root of the git.git repository. In 62ba514 (Move gitk to its own subdirectory, 2007-11-17) it was moved to a subdirectory, but some code used to track TCLTK_PATH was left in the main Makefile instead

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

2012-12-18 Thread Manlio Perillo
The git-completion.bash script did not implemented full, git aware, support for completion, for git commands that operate on files within the current working directory or the index. For these commands, only long options completion was available. As an example: git add TAB will suggest

[RFH/PATCH] git-compat-util.h: do not #include sys/param.h by default

2012-12-18 Thread Junio C Hamano
Earlier we allowed platforms that lack sys/param.h not to include the header file from git-compat-util.h; we have included this header file since the early days back when we used MAXPATHLEN (which we no longer use) and also depended on it slurping ULONG_MAX (which we get by including stdint.h or

Incorrect man page for git-diff

2012-12-18 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi. Documentation seems to suggest this is supported, but it is not true: $ git diff HEAD:git.c HEAD~100:git.c -- git.c usage: git diff [options] [commit [commit]] [--] [path...] unless I'm missing something. Manlio -BEGIN PGP

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

2012-12-18 Thread Junio C Hamano
[jch: cc'ed git-completion experts to review implementation details] Manlio Perillo manlio.peri...@gmail.com writes: The git-completion.bash script did not implemented full, git aware, support for completion, for git commands that operate on files within the current working directory or the

Re: Re: [PATCH] completion: add option --recurse-submodules to git push

2012-12-18 Thread Heiko Voigt
Hi, sorry for the late reply. On Fri, Dec 07, 2012 at 09:21:33AM -0800, Junio C Hamano wrote: Steffen Jaeckel steffen.jaec...@stzedn.de writes: Signed-off-by: Steffen Jaeckel steffen.jaec...@stzedn.de --- contrib/completion/git-completion.bash | 9 + 1 file changed, 9

Re: Incorrect man page for git-diff

2012-12-18 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com writes: Documentation seems to suggest this is supported, but it is not true: $ git diff HEAD:git.c HEAD~100:git.c -- git.c usage: git diff [options] [commit [commit]] [--] [path...] unless I'm missing something. Neither HEAD:git.c nor

[PATCH] Makefile: replace echo 1... with echo ...

2012-12-18 Thread Christian Couder
This is clearer to many people this way. A similar patch has been sent to the git mailing list for git.git. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Hi Pat, Here is a patch to apply to your git-gui tree following this discussion:

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

2012-12-18 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 18/12/2012 18:53, Junio C Hamano ha scritto: [jch: cc'ed git-completion experts to review implementation details] Manlio Perillo manlio.peri...@gmail.com writes: The git-completion.bash script did not implemented full, git aware, support

[PATCH v5 1/3] Makefile: remove tracking of TCLTK_PATH

2012-12-18 Thread Christian Couder
It looks like we are tracking the value of TCLTK_PATH in the main Makefile for no good reason. This patch removes the useless code used to do this tracking. Maybe this code should have been moved to gitk-git/Makefile by 62ba514 (Move gitk to its own subdirectory, 2007-11-17). A patch to do that

[PATCH v5 3/3] Makefile: replace echo 1... with echo ...

2012-12-18 Thread Christian Couder
This is clearer to many people this way. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Makefile | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7db8445..e055c9a 100644 --- a/Makefile +++ b/Makefile @@ -2183,7 +2183,7 @@ endef

[PATCH v5 2/3] Makefile: detect when PYTHON_PATH changes

2012-12-18 Thread Christian Couder
When make is run, the python scripts are created from *.py files that are changed to use the python given by PYTHON_PATH. And PYTHON_PATH is set by default to /usr/bin/python on Linux. This is nice except when you run make another time setting a different PYTHON_PATH, because, as the python

Re: Incorrect man page for git-diff

2012-12-18 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 18/12/2012 19:11, Junio C Hamano ha scritto: Manlio Perillo manlio.peri...@gmail.com writes: Documentation seems to suggest this is supported, but it is not true: $ git diff HEAD:git.c HEAD~100:git.c -- git.c usage: git diff [options]

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

2012-12-18 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com writes: Il 18/12/2012 18:53, Junio C Hamano ha scritto: [jch: cc'ed git-completion experts to review implementation details] Manlio Perillo manlio.peri...@gmail.com writes: The git-completion.bash script did not implemented full, git aware, support

t7004: do not create unneeded gpghome/gpg.conf when GPG is not used

2012-12-18 Thread Junio C Hamano
These tests themselves are properly protected by the GPG prerequisite, but one of the set-up steps outside the test_expect_success block unconditionally assumed that there is a gpghome/ directory, which is not true if GPG is not being used. It may be a good idea to move the whole set-up steps in

Re: Incorrect man page for git-diff

2012-12-18 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com writes: I'm not sure the man page is wrong and should be changed: -- usage: git diff [options] [commit [commit]] [--] [path...] ++ usage: git diff [options] [commit [commit]] Comparison of two blob objects works entirely in different way (it is not

Re: sys/param.h

2012-12-18 Thread Torsten Bögershausen
On 18.12.12 18:01, Junio C Hamano wrote: Johannes Sixt j.s...@viscovery.net writes: Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very much appreciated---does your

Q: do people compile with NO_FNMATCH on OpenBSD 5.2?

2012-12-18 Thread Junio C Hamano
I seem to get a failure from git ls-files a* in t/t-basic.sh if I link with platform's fnmatch(). -- 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 v3] git-completion.bash: add support for path completion

2012-12-18 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 18/12/2012 20:22, Junio C Hamano ha scritto: [...] Note that the performance is the reason why I suggested, in a previous email, that git should have some more options to format data in custom ways. As an example, there is no way to tell

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

2012-12-18 Thread Greg Troxel
Junio C Hamano gits...@pobox.com writes: I seem to get a failure from git ls-files a* in t/t-basic.sh if I link with platform's fnmatch(). Not what you asked, but on NetBSD 5.1, libc fnmatch is used, and with git 1.8.0.1 that test passes. This prompted me to look at the rest of

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

2012-12-18 Thread Junio C Hamano
Greg Troxel g...@ir.bbn.com writes: *** t0070-fundamental.sh *** ok 1 - character classes (isspace, isalpha etc.) not ok - 2 mktemp to nonexistent directory prints filename # # test_must_fail test-mktemp doesnotexist/testXX 2err # grep

Feature suggestion: new 'git add -i' command to discard working copy changes

2012-12-18 Thread Evan Driscoll
It's not infrequent that I want to discard changes I've made locally to files ('git checkout file.txt') and find myself wishing that this was an action available from the 'git add --interactive' UI; it feels like it would fit in. Does this sound like it would be useful? I might even be able to

Re: Feature suggestion: new 'git add -i' command to discard working copy changes

2012-12-18 Thread Junio C Hamano
Evan Driscoll drisc...@cs.wisc.edu writes: It's not infrequent that I want to discard changes I've made locally to files ('git checkout file.txt') and find myself wishing that this was an action available from the 'git add --interactive' UI; it feels like it would fit in. Hrm, not really.

Re: Feature suggestion: new 'git add -i' command to discard working copy changes

2012-12-18 Thread Jeff King
On Tue, Dec 18, 2012 at 01:34:38PM -0800, Junio C Hamano wrote: Evan Driscoll drisc...@cs.wisc.edu writes: It's not infrequent that I want to discard changes I've made locally to files ('git checkout file.txt') and find myself wishing that this was an action available from the 'git add

[PATCH v2 0/2] Port to QNX

2012-12-18 Thread Matt Kraai
This series ports Git to QNX. It differs from the previous version in that: * it's rebased on dm/port, so it narrows the scope of the lock variable in builtin/fetch-pack.c instead of fetch-pack.c and uses HAVE_STRINGS_H; and * it disables use of Pthreads, since fork(2) doesn't work once

[PATCH v2 1/2] Make lock local to fetch_pack

2012-12-18 Thread Matt Kraai
From: Matt Kraai matt.kr...@amo.abbott.com lock is only used by fetch_pack, so move it into that function. Signed-off-by: Matt Kraai matt.kr...@amo.abbott.com --- builtin/fetch-pack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/fetch-pack.c

[PATCH v2 2/2] Port to QNX

2012-12-18 Thread Matt Kraai
From: Matt Kraai matt.kr...@amo.abbott.com Signed-off-by: Matt Kraai matt.kr...@amo.abbott.com --- Makefile | 21 + git-compat-util.h | 6 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c1f04f..a39dc83 100644 ---

Re: Feature suggestion: new 'git add -i' command to discard working copy changes

2012-12-18 Thread Evan Driscoll
On 12/18/2012 03:59 PM, Jeff King wrote: I always assumed nobody really used the full add -i, but maybe it is because I am such a command-line snob. Evan, are you after hunk selection (like choosing patch from the interactive UI), or full path selection? Mostly the latter. I have two use

Re: Feature suggestion: new 'git add -i' command to discard working copy changes

2012-12-18 Thread Jeff King
On Tue, Dec 18, 2012 at 04:10:34PM -0600, Evan Driscoll wrote: I have two use cases of 'add -i'. The more common one is if I kind of want -p but don't want to do it for every file. (I guess in part this is my way of substituting for not knowing all the actions during -p as well.) But I

Re: Prebuilt man pages on Google code

2012-12-18 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: While investigating Asciidoc's quoting in this thread [1], I noticed that my system man pages don't display Asciidoc double quoted text correctly. ... I can't see any configuration option that could cause this difference, so I assume it must be caused

Re: [PATCH v5 2/3] Makefile: detect when PYTHON_PATH changes

2012-12-18 Thread Pete Wyckoff
chrisc...@tuxfamily.org wrote on Tue, 18 Dec 2012 20:00 +0100: When make is run, the python scripts are created from *.py files that are changed to use the python given by PYTHON_PATH. And PYTHON_PATH is set by default to /usr/bin/python on Linux. This is nice except when you run make

Re: [PATCH v5 2/3] Makefile: detect when PYTHON_PATH changes

2012-12-18 Thread Junio C Hamano
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 v2] git-clean: Display more accurate delete messages

2012-12-18 Thread Zoltan Klinger
Thanks for the feedback. My reading of the above is that lst after sorting is expected to have something like: a/ a/b/ a/b/to-be-removed a/to-be-removed and we first show a/, remember that prefix in dir, not show a/b/ because it matches prefix, but still

Re: Python extension commands in git - request for policy change

2012-12-18 Thread Patrick Donnelly
On Wed, Dec 12, 2012 at 7:43 AM, Eric S. Raymond e...@thyrsus.com wrote: Patrick Donnelly batr...@batbytes.com: How would another language (e.g. Python) mitigate this? The way you mitigate this sort of problem is to have a good set of high-level bindings for standard services (like

Re: [PATCH v2] git-clean: Display more accurate delete messages

2012-12-18 Thread Junio C Hamano
Zoltan Klinger zoltan.klin...@gmail.com writes: Thanks for the feedback. My reading of the above is that lst after sorting is expected to have something like: a/ a/b/ a/b/to-be-removed a/to-be-removed and we first show a/, remember that prefix in dir,

[PATCH] t3600: Avoid cp -a which is a GNUism

2012-12-18 Thread Junio C Hamano
With d4a7ffa (tests: cp -a is a GNUism, 2012-10-08), we got rid of most of them, but a topic that was still in flight was missed. Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t3600-rm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t3600-rm.sh

[PATCH] t4014: fix arguments to grep

2012-12-18 Thread Junio C Hamano
These expect-failure tests were not looking for the right string in the patch file. For example: grep ^ *S. E. Cipient scipi...@example.com\$ patch5 was looking for ^ *S. in three files: E. Cipient scipi...@example.com$ patch5 With some implementations of grep, the lack of

[PATCH] t9020: use configured Python to run test helper

2012-12-18 Thread Junio C Hamano
The test helper svnrdump_sim.py is used as svnrdump during the execution of this test, but the arrangement had a few undesirable things: - it relied on symbolic links; - unportable export VAR=VAL was used; - GIT_BUILD_DIR variable was not quoted correctly; - it assumed that the Python

[PATCH] t9502: do not assume GNU tar

2012-12-18 Thread Junio C Hamano
The check_snapshot function inspects and makes sure that not cruft outside the repository hierarchy is added to the tar archive, by insisting that the output from tar tf on the resulting archive does not contain anything that does not begin with $prefix/. There are two issues with this

[RFC/PATCH] tests: optionally fail passed todo immediately

2012-12-18 Thread Junio C Hamano
Add --fail-passed-todo option to stop the test immediately when a test that is expected to fail succeeds. After seeing the test stop, the developer can go to the trash directory and inspect why it failed to fail as expected. I usually just insert exit after such test with an editor, but an

ATMCard Maestro FREE LOTTO

2012-12-18 Thread root
ATMCard Maestro FREE LOTTO You just won £500,000. For claim send your name, address, email Phone No. to Email: atmcardremittanc...@qatar.io for claims. TCs Apply -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH] t0200: locale may not exist

2012-12-18 Thread Junio C Hamano
On systems without locale installed, t0200-gettext-basic.sh leaked error messages when checking if some test locales are available. Hide them, as they are not very useful. Signed-off-by: Junio C Hamano gits...@pobox.com --- t/lib-gettext.sh | 6 -- 1 file changed, 4 insertions(+), 2

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 17:24, schrieb Jeff King: I am not really interested in pushing this forward myself, but I worked up this toy that somebody might find interesting (you can git replace HEAD~20 to get dumped in an editor). It should probably handle trees, and it would probably make sense to do