Re: [PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set

2013-07-04 Thread Junio C Hamano
Alexey Shumkin writes: > In de6029a2d7734a93a9e27b9c4471862a47dd8123 'complex-subject' test was > changed. Revert it back,... ... "because changing it was bad for such and such reasons"? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: [PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-04 Thread Junio C Hamano
Alexey Shumkin writes: > This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123, > which was applied before final patch series was sent. > > Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f for the explanation > of such a replacement. These are not very useful in a log message.

Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable

2013-07-04 Thread Junio C Hamano
Alexey Shumkin writes: > Function 'test_format' is become hard to read after its change in > de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant. > Also, change 'commit_msg' function to make it more pretty. I do not know where you pick up these "more elegant" and "more pretty" fro

Re: unexpected file deletion after using git rebase --abort

2013-07-04 Thread Eric Sunshine
On Thu, Jul 4, 2013 at 3:35 PM, Paul A. Kennedy wrote: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index aca8405..ffaef29 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -238,6 +238,13 @@ leave out at most one of A and B, in wh

Re: [PATCH] send-email: provide port separately from hostname

2013-07-04 Thread brian m. carlson
On Fri, Jul 05, 2013 at 04:12:19AM +0530, Ramkumar Ramachandra wrote: > Hm, so the problem occurs when you give smtp_host_string() to > Net::SMTP->new() as the first argument. Yes. I created a test program, and Net::SMTP was fine as long as I used Port, but failed when I included the port in the

Re: [PATCH] send-email: provide port separately from hostname

2013-07-04 Thread Ramkumar Ramachandra
brian m. carlson wrote: > diff --git a/git-send-email.perl b/git-send-email.perl > index bd13cc8..ca86a13 100755 > --- a/git-send-email.perl > +++ b/git-send-email.perl > @@ -1199,9 +1199,11 @@ X-Mailer: git-send-email $gitversion > else { > require Net::SMTP

[PATCH] send-email: provide port separately from hostname

2013-07-04 Thread brian m. carlson
From: "brian m. carlson" If the SMTP port is provided as part of the hostname to Net::SMTP, it passes the combined string to the SASL provider; this causes GSSAPI authentication to fail since Kerberos does not want the port information. Instead, pass the port as a separate argument as is done fo

[PATCH] test-lib.sh - cygwin does not have usable FIFOs

2013-07-04 Thread Mark Levedahl
Do not use FIFOs on cygwin, they do not work. Cygwin includes coreutils, so has mkfifo, and that command does something. However, the resultant named pipe is known (on the Cygwin mailing list at least) to not work correctly. This disables PIPE for Cygwin, allowing t0008.sh to complete (all other t

Re: [PATCH v2 1/2] commit: reject invalid UTF-8 codepoints

2013-07-04 Thread brian m. carlson
On Thu, Jul 04, 2013 at 09:58:08PM +0200, Torsten Bögershausen wrote: > On 2013-07-04 19.19, brian m. carlson wrote: > > The commit code already contains code for validating UTF-8, but it does not > > check for invalid values, such as guaranteed non-characters and surrogates. > > Fix > s/guarante

[PATCH v8 5/7] git-remote-mediawiki: Factoring code between git-remote-mediawiki and Git::Mediawiki

2013-07-04 Thread benoit . person
From: Benoit Person For now, Git::Mediawiki contains nothing. This first patch moves some of git-remote-mediawiki.perl's factorisable code into Git::Mediawiki. In the same time, it removes the side effects of that code and renames the fucntions and constants moved to expose a better API. Signed

[PATCH v8 7/7] git-remote-mediawiki: Add preview subcommand into git mw

2013-07-04 Thread benoit . person
From: Benoit Person In the current state, a user of git-remote-mediawiki can edit the markup text locally, but has to push to the remote wiki to see how the page is rendererd. Add a new 'git mw preview' command that allows rendering the markup text on the remote wiki without actually pushing any

[PATCH v8 4/7] git-remote-mediawiki: Update tests to run with the new bin-wrapper

2013-07-04 Thread benoit . person
From: Benoit Person Until now, if git-remote-mediawiki was not installed, the test suite copied it to the toplevel directory. This solution pollutes the directory with untracked files. Plus, we would need to copy the new git-mw.perl file to test it too. Signed-off-by: Benoit Person Signed-off-b

[PATCH v8 1/7] git-remote-mediawiki: Introduction of Git::Mediawiki.pm

2013-07-04 Thread benoit . person
From: Benoit Person We would want to allow the user to preview what he has edited locally before pushing it out (and thus creating a non-removable revision in the mediawiki's history). This patch introduces a new perl package in which we will be able to share code between that new tool and the r

[PATCH v8 6/7] git-remote-mediawiki: Adding git-mw command

2013-07-04 Thread benoit . person
From: Benoit Person For now, git-remote-mediawiki is only a remote-helper. This patch adds a new toolset script in which we will be able to build new tools for git-remote-mediawiki. This toolset uses a subcommand-mechanism to launch the proper action. For now only the 'help' subcommand is implem

[PATCH v8 3/7] git-remote-mediawiki: New git bin-wrapper for developement

2013-07-04 Thread benoit . person
From: Benoit Person The introduction of the Git::Mediawiki package makes it impossible to test, without installation, git-remote-mediawiki and git-mw. Using a git bin-wrapper enables us to define proper $GITPERLLIB to force the use of the developement version of the Git::Mediawiki package, bypas

[PATCH v8 0/7] git-remote-mediawiki: new tool to preview local changes without pushing

2013-07-04 Thread benoit . person
From: Benoit Person The #7 issue on git-mediawiki's issue tracker [1] states that the ability to preview content without pushing would be a nice thing to have. changes from v7: - Update commit message of 1/7: remove the obvious (we need a way to share code between scripts) and make the com

[PATCH v8 2/7] wrap-for-bin: Make bin-wrappers chainable

2013-07-04 Thread benoit . person
From: Benoit Person For now, bin-wrappers overwrites GITPERLLIB. If we want to chain to those scripts and define GITPERLLIB before, our changes will be discarded. This patch makes the bin-wrappers prepend their modifications to GITPERLLIB rather than redefining it. It also unset GITPERLLIB in th

Re: [PATCH v2 1/2] commit: reject invalid UTF-8 codepoints

2013-07-04 Thread Torsten Bögershausen
On 2013-07-04 19.19, brian m. carlson wrote: > The commit code already contains code for validating UTF-8, but it does not > check for invalid values, such as guaranteed non-characters and surrogates. > Fix s/guaranteed non-characters/code points out of range/ > this by explicitly checking for an

Re: unexpected file deletion after using git rebase --abort

2013-07-04 Thread Paul A. Kennedy
On Wed, Jul 03, 2013 at 04:04:23PM -0700, Junio C Hamano wrote: > Jonathan Nieder writes: > > Paul A. Kennedy wrote: > > > If we don't expect this, should we update the documentation for the > > > --abort heading in the git rebase man page to indicate that newly > > > staged content will be lost a

Re: [RFC/PATCH 0/1] cygwin: Remove the Win32 l/stat() functions

2013-07-04 Thread Ramsay Jones
Junio C Hamano wrote: > I like the part that gets rid of that "get-mode-bits" but at the > same time, I find this part wanting a reasonable in-code comment. Indeed. (As I said, a bit rough around the edges ;-) > At least, with the earlier get-mode-bits, it was clear why we are > doing something s

Re: [PATCH 1/2] show-ref.c: Add missing call to git_config()

2013-07-04 Thread Ramsay Jones
Junio C Hamano wrote: > Ramsay Jones writes: > >> Yes, I will send a v2 (soon-ish, I hope). > > Ping? > > No need to hurry, but just to make sure this didn't disappear from > everybody's radar. Yep, this is still on my TODO list. Sorry for being tardy on these patches. :( ATB, Ramsay Jones

Re: intend-to-edit flag

2013-07-04 Thread Thomas Koch
On Thursday, July 04, 2013 08:10:07 PM Ævar Arnfjörð Bjarmason wrote: > Why don't you just start using Git and see if this becomes a practical > problem rather than devising some elaborate solution to work around > something that probably won't be an issue anyway? I've been giving talks about Git

Re: intend-to-edit flag

2013-07-04 Thread John Keeping
On Thu, Jul 04, 2013 at 08:10:07PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jul 4, 2013 at 7:56 PM, Thomas Koch wrote: > > we're evaluating Git to be used in our companies Tool. But a hard > > requirement > > is the possibility to set an "intend-to-edit" flag on a file (better path). > > N

Re: intend-to-edit flag

2013-07-04 Thread Ævar Arnfjörð Bjarmason
On Thu, Jul 4, 2013 at 7:56 PM, Thomas Koch wrote: > we're evaluating Git to be used in our companies Tool. But a hard requirement > is the possibility to set an "intend-to-edit" flag on a file (better path). > Notice that I did not use the word "lock"! :-) > > One easy implementation might be a s

intend-to-edit flag

2013-07-04 Thread Thomas Koch
Hi, we're evaluating Git to be used in our companies Tool. But a hard requirement is the possibility to set an "intend-to-edit" flag on a file (better path). Notice that I did not use the word "lock"! :-) One easy implementation might be a special branch "XYZ-locks" that contains an empty blob

Re: [PATCH v3] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Jakub Narębski
On Thu, Jul 4, 2013 at 7:02 PM, Tony Finch wrote: > There are often parent pages logically above the gitweb projects > list, e.g. home pages of the organization and department that host > the gitweb server. This change allows you to include links to those > pages in gitweb's breadcrumb trail. > >

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Jakub Narębski
On Thu, Jul 4, 2013 at 7:08 PM, Tony Finch wrote: > Jakub Narębski wrote: >> >> In what situation do you need those extra breadcrumbs useful? What >> necessity / itch to scratch is behind idea of this patch? > > For an example, see https://git.csx.cam.ac.uk/x/ucs/git/git.git > > I have three item

[PATCH v2 2/2] commit: reject overlong UTF-8 sequences

2013-07-04 Thread brian m. carlson
The commit code accepts pseudo-UTF-8 sequences that encode a character with more bytes than necessary. Reject such sequences, since they are not valid UTF-8. Signed-off-by: brian m. carlson --- commit.c | 17 +++-- t/t3900-i18n-commit.sh | 11 +++ 2 files chang

[PATCH v2 1/2] commit: reject invalid UTF-8 codepoints

2013-07-04 Thread brian m. carlson
The commit code already contains code for validating UTF-8, but it does not check for invalid values, such as guaranteed non-characters and surrogates. Fix this by explicitly checking for and rejecting such characters. Signed-off-by: brian m. carlson --- commit.c | 27

[PATCH v3] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
There are often parent pages logically above the gitweb projects list, e.g. home pages of the organization and department that host the gitweb server. This change allows you to include links to those pages in gitweb's breadcrumb trail. Signed-off-by: Tony Finch Reviewed-by: Jonathan Nieder ---

[PATCH v2 0/2] commit: improve UTF-8 validation

2013-07-04 Thread brian m. carlson
This series contains a pair of patches that improve the validation of the UTF-8 used in commit messages. Invalid codepoints, such as surrogates and guaranteed non-characters, are rejected, along with overlong UTF-8 sequences. Changes from v1: * Improved comments to aid those less familiar with U

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
Jakub Narębski wrote: > > In what situation do you need those extra breadcrumbs useful? What > necessity / itch to scratch is behind idea of this patch? For an example, see https://git.csx.cam.ac.uk/x/ucs/git/git.git I have three items in @extra_breadcrumbs which point to the University home pag

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Jakub Narębski
On Thu, Jul 4, 2013 at 5:56 PM, Tony Finch wrote: > Jakub Narębski wrote: >> >> First, do I understand correctly that @extra_breadcrumbs are rendered *after* >> $home_link*, and in exactly the same manner? > > Before the home link, and yes, in the same manner. The extra breadcrumbs > are for link

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
Jakub Narębski wrote: > > First, do I understand corrctly that @extra_breadcrumbs are rendered *after* > $home_link*, and in exactly the same manner? Before the home link, and yes, in the same manner. The extra breadcrumbs are for links to parent pages above gitweb in some hierarchy. > But now I

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Jakub Narębski
On Thu, Jul 4, 2013 at 5:11 PM, Tony Finch wrote: > Jakub Narębski wrote: >> >> It would be better to improve documentation, than follow current bad >> practice... ;-P > > The v2 patch does just that :-) Thanks. >> Perhaps even make ( [ $home_link_str, $home_link ] ) to be default >> value for

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
Jakub Narębski wrote: > > It would be better to improve documentation, than follow current bad > practice... ;-P The v2 patch does just that :-) > Perhaps even make ( [ $home_link_str, $home_link ] ) to be default > value for @extra_breadcrumbs, making new feature generalization > of $home_link*

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Jakub Narębski
On Thu, Jul 4, 2013 at 10:44 AM, Tony Finch wrote: > Jakub Narębski wrote: >> On Wed, Jul 3, 2013 at 11:59 PM, Jonathan Nieder wrote: >>> Tony Finch wrote: >> +@extra_breadcrumbs:: BTW. perhaps (it is only an idea) @top_level_breadcrumbs or @home_breadcrumbs would be a better name for this

Re: [PATCH 0/6] Corrections to the mailmap file

2013-07-04 Thread Stefan Beller
Here is a script to display the entries I was referring to: --- #!/bin/bash git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles while read line ; do # remove leading whitespace trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g') echo "git sh

[PATCH] config: add support for http..* settings

2013-07-04 Thread Kyle McKay
The value is considered a match to a url if the value is a prefix of the url which ends on a path component boundary ('/'). So "https://example.com/test"; will match "https://example.com/test"; and "https://example.com/test/too"; but not "https://example.com/testextra";. Longer matches take pr

[PATCH 1/6] .mailmap: Multiple email addresses of Alejandro R. Sedeño

2013-07-04 Thread Stefan Beller
This is obvious as its only difference is capital letters in one of the mail addresses. Signed-off-by: Stefan Beller --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 345cce6..3a4dd49 100644 --- a/.mailmap +++ b/.mailmap @@ -5,6 +5,7 @@ # same person app

[PATCH 3/6] .mailmap: Multiple mail addresses of Paul Mackerras

2013-07-04 Thread Stefan Beller
This is an obvious one, as the .(none) addresses are not valid mail addresses. Signed-off-by: Stefan Beller --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index cd46d24..6d75678 100644 --- a/.mailmap +++ b/.mailmap @@ -76,6 +76,8 @@ Nanako Shiraishi Nana

[PATCH 6/6] .mailmap: Multiple mail addresses of Toby Allsopp

2013-07-04 Thread Stefan Beller
Different capitalization Signed-off-by: Stefan Beller --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index d7d7b89..7e5638d 100644 --- a/.mailmap +++ b/.mailmap @@ -97,6 +97,7 @@ Steven Grimm Tay Ray Chuan Theodore Ts'o Thomas Rast +Toby Allsopp T

[PATCH 5/6] .mailmap: Multiple mail addresses of Johannes Schindelin

2013-07-04 Thread Stefan Beller
Different capitalization. Signed-off-by: Stefan Beller --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 1e94906..d7d7b89 100644 --- a/.mailmap +++ b/.mailmap @@ -38,6 +38,7 @@ Jakub Narębski Jay Soffian Jeff King Joachim Berdal Haga +Johannes Sch

[PATCH 2/6] .mailmap: Multiple mail addresses of Alex Riesen

2013-07-04 Thread Stefan Beller
Signed-off-by: Stefan Beller Signed-off-by: Alex Riesen --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 3a4dd49..cd46d24 100644 --- a/.mailmap +++ b/.mailmap @@ -6,6 +6,9 @@ # Alejandro R. Sedeño +Alex Riesen +Alex Riesen +Alex Riesen Al

[PATCH 0/6] Corrections to the mailmap file

2013-07-04 Thread Stefan Beller
Hello, I noticed many duplicates in email addresses but having the same name by running: # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d Most of these entries are most probably the same person, but we cannot be sure, as there m

[PATCH 4/6] .mailmap: Multiple mail addresses of Keith Cascio

2013-07-04 Thread Stefan Beller
Capital letters in mail address. Signed-off-by: Stefan Beller --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 6d75678..1e94906 100644 --- a/.mailmap +++ b/.mailmap @@ -52,6 +52,7 @@ Junio C Hamano Junio C Hamano Junio C Hamano Karl Hasselström

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Orgad Shaneh
On Thu, Jul 4, 2013 at 3:42 PM, Antoine Pelisse wrote: >>> Your problem is that your hook script is not checking $2 so it is >>> overwriting the message even when you do not want to do so. >> >> No, it isn't. Not by git-gui at least. Check /tmp/hook.log with the >> hook I provided... > > So what y

[PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set

2013-07-04 Thread Alexey Shumkin
In de6029a2d7734a93a9e27b9c4471862a47dd8123 'complex-subject' test was changed. Revert it back, and add two more tests to test encoding conversions with no i18n.commitEncoding set. Signed-off-by: Alexey Shumkin Reviewed-by: Johannes Sixt --- t/t6006-rev-list-format.sh | 32 +

[PATCH v9 5/5] t4205: avoid using `sed`

2013-07-04 Thread Alexey Shumkin
For testing truncated log messages 'commit_msg' function uses `sed` to cut a message. On various platforms `sed` behaves differently and results of its work depend on locales installed. So, avoid using `sed`. Use predefined expected outputs instead of calculated ones. Signed-off-by: Alexey Shumkin

[PATCH v9 2/5] t4205: revert back single quotes

2013-07-04 Thread Alexey Shumkin
In previuos commit de6029a2d7734a93a9e27b9c4471862a47dd8123 single quotes were replaced with double quotes to make "$(commit_msg)" expression in heredoc to work. The same effect can be achieved by using "EOF" as a heredoc delimiter instead of "\EOF". Signed-off-by: Alexey Shumkin Suggested-by: Jo

[PATCH v9 3/5] t4205, t6006, t7102: make functions more readable

2013-07-04 Thread Alexey Shumkin
Function 'test_format' is become hard to read after its change in de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant. Also, change 'commit_msg' function to make it more pretty. Signed-off-by: Alexey Shumkin Improved-by: Johannes Sixt --- t/t4205-log-pretty-formats.sh | 5 +++--

[PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-04 Thread Alexey Shumkin
This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123, which was applied before final patch series was sent. Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f for the explanation of such a replacement. Signed-off-by: Alexey Shumkin Reviewed-by: Johannes Sixt --- t/t4041-diff-su

[PATCH v9 0/5] Incremental updates against 'next' branch

2013-07-04 Thread Alexey Shumkin
This patch series is an incremental updates on top of (7c375214 t4205: replace .\+ with ..* in sed commands, 2013-07-01) as far as v7 patches were applied to the 'next' branch but there were more improvements made in v8. Alexey Shumkin (5): t4041, t4205, t6006, t7102: use iso8859-1 rather than i

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Antoine Pelisse
>> Your problem is that your hook script is not checking $2 so it is >> overwriting the message even when you do not want to do so. > > No, it isn't. Not by git-gui at least. Check /tmp/hook.log with the > hook I provided... So what you mean is that the hook is not executed with the correct parame

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Orgad Shaneh
On Thu, Jul 4, 2013 at 2:19 PM, John Keeping wrote: > On Thu, Jul 04, 2013 at 01:59:10PM +0300, Orgad Shaneh wrote: >> On Thu, Jul 4, 2013 at 1:34 PM, John Keeping wrote: >> > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: >> >> Hi, >> >> >> >> If a prepare-commit-msg hook is used,

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread John Keeping
On Thu, Jul 04, 2013 at 01:59:10PM +0300, Orgad Shaneh wrote: > On Thu, Jul 4, 2013 at 1:34 PM, John Keeping wrote: > > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: > >> Hi, > >> > >> If a prepare-commit-msg hook is used, git gui executes it for "New Commit". > >> > >> If the "New

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Fredrik Gustafsson
On Thu, Jul 04, 2013 at 01:59:10PM +0300, Orgad Shaneh wrote: > On Thu, Jul 4, 2013 at 1:34 PM, John Keeping wrote: > > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: > >> Hi, > >> > >> If a prepare-commit-msg hook is used, git gui executes it for "New Commit". > >> > >> If the "New

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Orgad Shaneh
On Thu, Jul 4, 2013 at 1:34 PM, John Keeping wrote: > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: >> Hi, >> >> If a prepare-commit-msg hook is used, git gui executes it for "New Commit". >> >> If the "New Commit" is selected, and then immediately "Amend" (before >> the hook retur

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread John Keeping
On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: > Hi, > > If a prepare-commit-msg hook is used, git gui executes it for "New Commit". > > If the "New Commit" is selected, and then immediately "Amend" (before > the hook returns), when the hook returns the message is replaced with > t

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Fredrik Gustafsson
On Thu, Jul 04, 2013 at 01:03:31PM +0300, Orgad Shaneh wrote: > On Thu, Jul 4, 2013 at 1:01 PM, Fredrik Gustafsson wrote: > > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: > >> If a prepare-commit-msg hook is used, git gui executes it for "New Commit". > >> > >> If the "New Commit"

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Orgad Shaneh
On Thu, Jul 4, 2013 at 1:01 PM, Fredrik Gustafsson wrote: > On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: >> If a prepare-commit-msg hook is used, git gui executes it for "New Commit". >> >> If the "New Commit" is selected, and then immediately "Amend" (before >> the hook returns),

Re: git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Fredrik Gustafsson
On Thu, Jul 04, 2013 at 12:47:28PM +0300, Orgad Shaneh wrote: > If a prepare-commit-msg hook is used, git gui executes it for "New Commit". > > If the "New Commit" is selected, and then immediately "Amend" (before > the hook returns), when the hook returns the message is replaced with > the one pr

[PATCH v2] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
There are often parent pages logically above the gitweb projects list, e.g. home pages of the organization and department that host the gitweb server. This change allows you to include links to those pages in gitweb's breadcrumb trail. Signed-off-by: Tony Finch Reviewed-by: Jonathan Nieder ---

git gui replaces amend message when prepare-commit-msg hook is used

2013-07-04 Thread Orgad Shaneh
Hi, If a prepare-commit-msg hook is used, git gui executes it for "New Commit". If the "New Commit" is selected, and then immediately "Amend" (before the hook returns), when the hook returns the message is replaced with the one produced by the hook. - Orgad -- To unsubscribe from this list: send

Re: [PATCH] Change "remote tracking" to "remote-tracking"

2013-07-04 Thread Michael Schubert
On Wed, Jul 03, 2013 at 11:38:51AM -0700, Jonathan Nieder wrote: > Michael Schubert wrote: > > > --- a/Documentation/git-p4.txt > > +++ b/Documentation/git-p4.txt > > @@ -180,7 +180,7 @@ subsequent 'sync' operations. > > Import changes into given branch. If the branch starts with > > 'ref

Re: [PATCH] gitweb: allow extra breadcrumbs to prefix the trail

2013-07-04 Thread Tony Finch
Jakub Narębski wrote: > On Wed, Jul 3, 2013 at 11:59 PM, Jonathan Nieder wrote: > > Tony Finch wrote: > > >> +@extra_breadcrumbs:: > >> + Additional links to be added to the start of the breadcrumb trail, > >> + that are logically "above" the gitweb projects list. For example, > >> +

Re: Review of git multimail

2013-07-04 Thread Michael Haggerty
Thanks for all of the information. On 07/03/2013 11:09 PM, Jed Brown wrote: > Ramkumar Ramachandra writes: > >> Yeah, this is good reasoning. And yes, I'm on Arch: python points to >> python3, and python2 points to python2. > > I'm also on Arch and it has been this way since October 2010 [1]

Re: Review of git multimail

2013-07-04 Thread Matthieu Moy
Jed Brown writes: > Note that RHEL5 has only python2.4 and will be supported through March, > 2017. Since it is not feasible to have code that works in both python3 > and any versions prior to python2.6, any chosen dialect will be broken > by default on some major distributions that still have f

Re: Feature request:

2013-07-04 Thread Matthieu Moy
Dany writes: > lol, confusion abound. this message was intended to be in response to "Re: > Feature request: prevent push -f from pushing all branches at once" While we're there: please, don't top-post here. Quote the part of the message you're replying to, and reply below. -- Matthieu Moy ht

Re: Feature request: prevent push -f from pushing all branches at once

2013-07-04 Thread Matthieu Moy
Dany writes: > Again, I think the case where one intends to force push many branches > is certainly not as common as the case where one intends to force push > one branch, so why does git's default behavior leave the user in the > position of fscking himself over pretty badly? I don't think the