Antw: Re: Extended splitting for git add --interactive

2014-11-27 Thread Ulrich Windl
I probably forgot to mention the obvious: My enhancement request was for cases where git would reject so split a junk. I don't want to change the default split (if it finds a point to split). So maybe call it a 2nd-level-split. Only if split refuses to split, you could avoid using edit to

Re: Re: Extended splitting for git add --interactive

2014-11-27 Thread Johan Herland
On Thu, Nov 27, 2014 at 9:55 AM, Ulrich Windl ulrich.wi...@rz.uni-regensburg.de wrote: I probably forgot to mention the obvious: My enhancement request was for cases where git would reject so split a hunk. I don't want to change the default split (if it finds a point to split). So maybe call

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-27 Thread Mark Levedahl
On 11/25/2014 12:03 AM, Jeff King wrote: On Mon, Nov 24, 2014 at 08:58:37PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: 1. It is a bit more obvious when debugging or dumping arguments (e.g., via GIT_TRACE), especially if new options are added after the first.

Re: Re: Extended splitting for git add --interactive

2014-11-27 Thread Brandon McCaig
Hello, On Thu, Nov 27, 2014 at 5:14 AM, Johan Herland jo...@herland.net wrote: FWIW, I would very much like a 2nd-level split where it simply splits into individual lines. I think it's not worth trying to be extra clever about it. For your example, I'd simply want the following behavior:

Uplift from SCCS to Git

2014-11-27 Thread Tony Finch
I have just completed a project to convert an old and scruffy SCCS working tree to Git. This conversion involved a fair amount of toolsmithing. I have published my conversion scripts at https://git.csx.cam.ac.uk/x/ucs/ipreg/sccs2rcs2cvs2git.git And there is a report on the conversion process at

Unable to Revert Commit

2014-11-27 Thread Rex Macey
Unable to Revert Commit ... Resolve the conflicts in your working directory and commit them before trying the revert again. Please help me understand how to resolve the conflicts. Here's what happened (as best as I remember). Created a windows folder github_learn (not under my

Re: 'simple' push check that branch name matches does not work if push.default is unset (and hence implicitly simple)

2014-11-27 Thread Adam Williamson
On Wed, 2014-11-26 at 22:43 -0500, Jeff King wrote: On Wed, Nov 26, 2014 at 02:29:28PM -0800, Adam Williamson wrote: Hi, folks. Ran into an unfortunate issue with git which helped me mess up a Fedora package repo today :/ The problem can be reproduced thus: 1. Create an empty

Re: Our cumbersome mailing list workflow

2014-11-27 Thread Torsten Bögershausen
On 2014-11-25 01.28, Michael Haggerty wrote: [] Let me list the aspects of our mailing list workflow that I find cumbersome as a contributor and reviewer: * Submitting patches to the mailing list is an ordeal of configuring format-patch and send-email and getting everything just right, using

Re: Our cumbersome mailing list workflow

2014-11-27 Thread Matthieu Moy
Torsten Bögershausen tbo...@web.de writes: On 2014-11-25 01.28, Michael Haggerty wrote: [] Let me list the aspects of our mailing list workflow that I find cumbersome as a contributor and reviewer: * Submitting patches to the mailing list is an ordeal of configuring format-patch and

Re: What's cooking in git.git (Nov 2014, #04; Wed, 26)

2014-11-27 Thread brian m. carlson
On Wed, Nov 26, 2014 at 03:09:45PM -0800, Junio C Hamano wrote: * nd/untracked-cache (2014-10-27) 19 commits - t7063: tests for untracked cache - update-index: test the system before enabling untracked cache - update-index: manually enable or disable untracked cache - status: enable

Re: [PATCHv3 2/3] mailmap: use higher level string list functions

2014-11-27 Thread Eric Sunshine
On Thu, Nov 27, 2014 at 1:44 PM, Michael Blume blume.m...@gmail.com wrote: The variable index seems to be unused/uninitialized now -- it's still printed in debug messages, but if I'm reading correctly, its contents are going to be nonsense. Nice catch. (Aside: Please don't top-post on this

Re: [ANNOUNCE] Git v2.2.0

2014-11-27 Thread Steven Noonan
On Wed, Nov 26, 2014 at 3:09 PM, Junio C Hamano gits...@pobox.com wrote: The latest feature release Git v2.2 is now available at the usual places. Big thanks go to 77 contributors, among which 20 are new people, who made 550+ changes in total since Git v2.1 was released. The tarballs are

Re: [PATCH] fast-import: support the ls command anywhere comments are accepted

2014-11-27 Thread Mike Hommey
On Wed, Nov 26, 2014 at 08:03:33AM +0900, Mike Hommey wrote: On Wed, Nov 26, 2014 at 07:25:39AM +0900, Mike Hommey wrote: The git-fast-import manual page says about both cat-blob and ls that they can be used anywhere in the stream that comments are accepted, but in practice it turns out

Re: Our cumbersome mailing list workflow

2014-11-27 Thread Eric Wong
Torsten Bögershausen tbo...@web.de wrote: On 2014-11-25 01.28, Michael Haggerty wrote: * Or I save the emails to a temporary directory (awkward because, Oh Horror, I use Thunderbird and not mutt as email client), hope that I've guessed the right place to apply them, run git am, and later

Re: [ANNOUNCE] Git v2.2.0

2014-11-27 Thread Jeff King
[nit: when quoting in your replies, please trim quotes to a reasonable length] On Thu, Nov 27, 2014 at 01:32:24PM -0800, Steven Noonan wrote: I'm sad to report that I'm getting test failures with this release. Built from git and did 'make -C t prove NO_SVN_TESTS=1' and got this result:

Re: 'simple' push check that branch name matches does not work if push.default is unset (and hence implicitly simple)

2014-11-27 Thread Jeff King
On Thu, Nov 27, 2014 at 09:12:27AM -0800, Adam Williamson wrote: It might also be worth improving the warn_unspecified_push_default_msg[] text to mention the name matching behaviour? At present it doesn't clearly explain this (you could argue it's *sort of* implied, but I doubt many people

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-27 Thread Jeff King
On Thu, Nov 27, 2014 at 09:40:08AM -0500, Mark Levedahl wrote: Then when you add new arguments, the hook has to search through the parameters looking for one that matches, rather than just checking $1 for amend (and $2 for the new option, and so on). As long as the set of options remains