Re: [PATCH 1/2] Fixes _is_git

2015-02-05 Thread Chris Packham
On Wed, Feb 4, 2015 at 4:52 AM, Rémi Rampin remiram...@gmail.com wrote: 2015-02-02 12:24 UTC-05:00, Remi Rampin remiram...@gmail.com: proc _is_git {path} { + if {[file isfile $path]} { + set fp [open $path r] + gets $fp line + close $fp +

[PATCH] decimal_width: avoid integer overflow

2015-02-05 Thread Jeff King
The decimal_width function originally appeared in blame.c as lineno_width, and was designed for calculating the print-width of small-ish integer values (line numbers in text files). In ec7ff5b, it was made into a reusable function, and in dc801e7, we started using it to align diffstats. Binary

Re: [PATCH] Correction to git-p4 exclude change

2015-02-05 Thread Luke Diamand
(Resending as plain text). I could be wrong about this, but my correction above doesn't seem to be in 'next'. Does that mean (reading your last what's cooking) that the broken version is going to go out to 'master' soon? Thanks, Luke On 5 February 2015 at 08:19, Luke Diamand l...@diamand.org

[PATCH 2/2] check-builtins: Strip any executable suffix to make it work on Windows

2015-02-05 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- check-builtins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-builtins.sh b/check-builtins.sh index 07cff69..a0aaf3a 100755 --- a/check-builtins.sh +++ b/check-builtins.sh @@ -3,7 +3,7 @@ { cat \EOF

[PATCH 1/2] Makefile: Improve wording in a comment

2015-02-05 Thread Sebastian Schuberth
Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c44eb3a..6f8ae23 100644 --- a/Makefile +++ b/Makefile @@ -2447,7 +2447,7 @@ check-docs:: esac; \ done ) | sort -###

[PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Sebastian Schuberth
For consistency, we should use the same source for symbolic links as for hard links and copies. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c44eb3a..21f23cb 100644 ---

[PATCH 2/2] Makefile: Also add a symlink fallback to installing ALL_PROGRAMS

2015-02-05 Thread Sebastian Schuberth
We do this for BUILT_INS and REMOTE_CURL_ALIASES, so we should do so here, too. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 21f23cb..d2849c3 100644 --- a/Makefile +++ b/Makefile @@ -2258,6

Bug report: Folder and files are deleted by git stash -u

2015-02-05 Thread Tobias Preuss
Hello. I noticed some bizarre behaviour when using: git stash -u. It deletes folders which contain files configured to be ignored. I actually lost files by this which I could not restore. Here is how you can reproduce the case. 1. Create a project folder to act as the root of the repository.

Re: [PATCH] config: do not ungetc EOF

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 01:53:27AM -0500, Jeff King wrote: I also notice that config_buf_ungetc does not actually ungetc the character we give it; it just rewinds one character in the stream. This is fine, because we always feed the last-retrieved character. I dunno if it is worth fixing (it

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Now, can you do that easily in a Makefile? ;) Or is it worth doing it? I do not mind a full symbolic link as long as it points at the correct place (Sebastian's version did not under DESTDIR which was the only issue I had against it), but is there a good

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Sebastian Schuberth
On Thu, Feb 5, 2015 at 9:45 PM, Jeff King p...@peff.net wrote: endif $(RM)·$$execdir/$$p··\ test·-z·$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)··\ ln·$$bindir/$$p·$$execdir/$$p·2/dev/null·||·\ +ln·-s·../$$p·$$execdir/$$p·2/dev/null·||·\

Re: [PATCH] config: do not ungetc EOF

2015-02-05 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Feb 05, 2015 at 01:53:27AM -0500, Jeff King wrote: I also notice that config_buf_ungetc does not actually ungetc the character we give it; it just rewinds one character in the stream. This is fine, because we always feed the last-retrieved character. I

Re: Advice on edits to git-rebase man page

2015-02-05 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: Perhaps something like this instead? git-rebase - Rebuild a branch on top of a different commit I would say Replay history on top of a different commit instead. Rebuild may be misleading (it's

Re: Advice on edits to git-rebase man page

2015-02-05 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Perhaps something like this instead? git-rebase - Rebuild a branch on top of a different commit I would say Replay history on top of a different commit instead. Rebuild may be misleading (it's not build as in compile link), and the rebased history

Re: [PATCH] config: do not ungetc EOF

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 01:16:36PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Thu, Feb 05, 2015 at 01:53:27AM -0500, Jeff King wrote: I also notice that config_buf_ungetc does not actually ungetc the character we give it; it just rewinds one character in the

Re: [BUG] Move tracking in git diff is not as good as in git status

2015-02-05 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: On Feb 4, 2015, at 22:11, Scott Schmit wrote: In my use of git, I've noticed that git status is a lot better at tracking moves and renames than git diff, and this has recently caused me a lot of headaches because a large number of moves were made in a

Re: [PATCH] Correction to git-p4 exclude change

2015-02-05 Thread Junio C Hamano
Luke Diamand l...@diamand.org writes: (Resending as plain text). I could be wrong about this, but my correction above doesn't seem to be in 'next'. Does that mean (reading your last what's cooking) that the broken version is going to go out to 'master' soon? The current copy of What's

Re: Bug report: Folder and files are deleted by git stash -u

2015-02-05 Thread Junio C Hamano
Tobias Preuss tobias.pre...@googlemail.com writes: I noticed some bizarre behaviour when using: git stash -u. It deletes folders which contain files configured to be ignored. The files you mark as ignored are expendable and this is not limited to stash. $ git init Initialized empty

Re: [PATCH 1/2] Makefile: Improve wording in a comment

2015-02-05 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Is that an improvement? Is the plural of dup (used as an abbreviation of duplicate) dupes not dups? Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 1/2] Makefile: Improve wording in a comment

2015-02-05 Thread Sebastian Schuberth
On Thu, Feb 5, 2015 at 8:17 PM, Junio C Hamano gits...@pobox.com wrote: Sebastian Schuberth sschube...@gmail.com writes: Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Is that an improvement? Is the plural of dup (used as an abbreviation of duplicate) dupes not dups? My view

Re: [PATCH 1/2] Makefile: Improve wording in a comment

2015-02-05 Thread Sebastian Schuberth
On Thu, Feb 5, 2015 at 8:19 PM, Sebastian Schuberth sschube...@gmail.com wrote: Is that an improvement? Is the plural of dup (used as an abbreviation of duplicate) dupes not dups? My view is that the abbreviation of duplicate is not dup but dupe, hence the plural dupes. For duplicate the

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: -ln -s git$X $$bindir/$$p 2/dev/null || \ +ln -s $$bindir/git$X $$bindir/$$p 2/dev/null || \ This is wrong. Currently with symlinks you will get installed into bindir something like this: git git-tag - git git-show - git

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Sebastian Schuberth
On Thu, Feb 5, 2015 at 8:23 PM, Junio C Hamano gits...@pobox.com wrote: This is wrong. Currently with symlinks you will get installed into bindir something like this: git git-tag - git git-show - git etc. With your change you would have git git-tag -

Git gc removes all packs

2015-02-05 Thread Dmitry Neverov
Hi, I'm experiencing a strange behavior of automatic git gc which corrupts a local repository. Git version 2.2.2 on Mac OS X 10.10.1. I'm using git p4 for synchronization with perforce. Sometimes after 'git p4 rebase' git starts a garbage collection. When gc finishes a local repository contains

What's cooking in git.git (Feb 2015, #02; Thu, 5)

2015-02-05 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Git 2.3 is out. I'll wait for some time for the dust to settle and then rewind and rebuild 'next'. You can find the changes described here in

A note from the maintainer

2015-02-05 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Kyle J. McKay
On Feb 5, 2015, at 12:59, Junio C Hamano wrote: I do not know (and I am not quite sure if I want to know) how serious your potential problems would be, and I do not doubt you know OS X quirks much better than I do and do not intend to argue there aren't such problems. I am just curious how

[ANNOUNCE] Git v2.3.0

2015-02-05 Thread Junio C Hamano
The latest feature release Git v2.3.0 is now available at the usual places. This one ended up to be a release with lots of small corrections and improvements without big uncomfortably exciting features. It is a lot smaller release than other recent feature releases, consisting of 255 non-merge

[PATCH 0/2] gitfile support git git-gui

2015-02-05 Thread Remi Rampin
New patch series. I hadn't realized Git doesn't recurse on gitdir: ... links itself, it only follows one. Also normalizes the path to the Git repository as requested. Remi Rampin (2): Fixes chooser not accepting gitfiles Makes chooser set 'gitdir' to the resolved path

[PATCH 1/2] Fixes chooser not accepting gitfiles

2015-02-05 Thread Remi Rampin
Makes _is_git handle the case where the path is a gitdir: ... file. --- lib/choose_repository.tcl | 10 ++ 1 file changed, 10 insertions(+) diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index 92d6022..abc6b1d 100644 --- a/lib/choose_repository.tcl +++

[PATCH 2/2] Makes chooser set 'gitdir' to the resolved path

2015-02-05 Thread Remi Rampin
If _is_git follows a gitdir: ... file link to get to the actual repository, we want _gitdir to be set to that final path. --- lib/choose_repository.tcl | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index

Re: [Qemu-devel] [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support

2015-02-05 Thread Eric Blake
[adding git list to cc] On 02/05/2015 04:49 AM, Stefan Hajnoczi wrote: On Wed, Jan 14, 2015 at 03:27:23PM +0800, Zhu Guihua wrote: This series is based on the previous patchset from Chen Fan: https://lists.nongnu.org/archive/html/qemu-devel/2014-05/msg02360.html This email has an invalid

Re: git tag --no-merged?

2015-02-05 Thread Peter Krefting
Kyle J. McKay: I think something like this might do what you want: git for-each-ref --format='%(refname)' refs/tags | \ while read t; do if ! git merge-base --is-ancestor $t HEAD; then echo ${t#refs/tags/} fi done That works like a charm, thank you! -- \\// Peter -

Re: Advice on edits to git-rebase man page

2015-02-05 Thread Matthieu Moy
Matthew Brett matthew.br...@gmail.com writes: Obviously my page as it is now is very different in tone from the git-rebase page, but I think there are some aspects that could be fruitfully merged. Would you be interested in patches of this sort, or does the page seem too far from the

Re: Advice on edits to git-rebase man page

2015-02-05 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: NAME git-rebase - Forward-port local commits to the updated upstream head = Quite technical already. Very much true, and I would say the description is technically correct in the sense that it is not wrong per-se. There are a few

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Kyle J. McKay
On Feb 5, 2015, at 07:51, Sebastian Schuberth wrote: For consistency, we should use the same source for symbolic links as for hard links and copies. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

Re: [PATCH 2/2] Makefile: Also add a symlink fallback to installing ALL_PROGRAMS

2015-02-05 Thread Kyle J. McKay
On Feb 5, 2015, at 07:52, Sebastian Schuberth wrote: We do this for BUILT_INS and REMOTE_CURL_ALIASES, so we should do so here, too. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index

Re: [Qemu-devel] [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support

2015-02-05 Thread Junio C Hamano
Eric Blake ebl...@redhat.com writes: On 02/05/2015 04:49 AM, Stefan Hajnoczi wrote: On Wed, Jan 14, 2015 at 03:27:23PM +0800, Zhu Guihua wrote: This series is based on the previous patchset from Chen Fan: https://lists.nongnu.org/archive/html/qemu-devel/2014-05/msg02360.html This email has

Re: Git gc removes all packs

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 04:13:03PM +0100, Dmitry Neverov wrote: I'm using git p4 for synchronization with perforce. Sometimes after 'git p4 rebase' git starts a garbage collection. When gc finishes a local repository contains no pack files only loose objects, so I have to re-import repository

Re: Bug report: Folder and files are deleted by git stash -u

2015-02-05 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Tobias Preuss tobias.pre...@googlemail.com writes: I noticed some bizarre behaviour when using: git stash -u. It deletes folders which contain files configured to be ignored. The files you mark as ignored are expendable and this is not limited to

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 08:26:08PM +0100, Sebastian Schuberth wrote: It is not even correct, is it? When DESTDIR is set to allow you to install into a temporary place only so that you can tar up the resulting filesystem tree, bindir points at the location we need to cp the built

Re: [Qemu-devel] [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 11:29:07AM -0800, Junio C Hamano wrote: Eric Blake ebl...@redhat.com writes: On 02/05/2015 04:49 AM, Stefan Hajnoczi wrote: On Wed, Jan 14, 2015 at 03:27:23PM +0800, Zhu Guihua wrote: This series is based on the previous patchset from Chen Fan:

Re: [PATCH 2/2] check-builtins: Strip any executable suffix to make it work on Windows

2015-02-05 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- check-builtins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-builtins.sh b/check-builtins.sh index 07cff69..a0aaf3a 100755 --- a/check-builtins.sh

Re: [PATCH 1/2] Makefile: Improve wording in a comment

2015-02-05 Thread Stefan Beller
On Thu, Feb 5, 2015 at 11:22 AM, Sebastian Schuberth sschube...@gmail.com wrote: On Thu, Feb 5, 2015 at 8:19 PM, Sebastian Schuberth sschube...@gmail.com wrote: Is that an improvement? Is the plural of dup (used as an abbreviation of duplicate) dupes not dups? My view is that the

Re: [Qemu-devel] [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support

2015-02-05 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Feb 05, 2015 at 11:29:07AM -0800, Junio C Hamano wrote: Eric Blake ebl...@redhat.com writes: On 02/05/2015 04:49 AM, Stefan Hajnoczi wrote: On Wed, Jan 14, 2015 at 03:27:23PM +0800, Zhu Guihua wrote: This series is based on the previous patchset

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Sebastian Schuberth
On Thu, Feb 5, 2015 at 8:51 PM, Jeff King p...@peff.net wrote: On Thu, Feb 05, 2015 at 08:26:08PM +0100, Sebastian Schuberth wrote: It is not even correct, is it? When DESTDIR is set to allow you to install into a temporary place only so that you can tar up the resulting filesystem

Re: [PATCH 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Kyle J. McKay
On Feb 5, 2015, at 11:51, Jeff King wrote: On Thu, Feb 05, 2015 at 08:26:08PM +0100, Sebastian Schuberth wrote: It is not even correct, is it? When DESTDIR is set to allow you to install into a temporary place only so that you can tar up the resulting filesystem tree, bindir points at the

Re: [PATCH] decimal_width: avoid integer overflow

2015-02-05 Thread Junio C Hamano
Thanks (and thanks for ungetc one, too). -- 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 1/2] Makefile: Use the same source directory for ln -s as for ln / cp

2015-02-05 Thread Jeff King
On Thu, Feb 05, 2015 at 09:29:04PM +0100, Sebastian Schuberth wrote: We would still want an equivalent to 2/2 to set up a relative symlink for $(ALL_PROGRAMS), though, right? Probably. But I'm not sure how to calculate the relative path correctly so that it'll work with all possible bin /