v2.9.3 and v2.10.0: `name-ref' HEAD gives wrong branch name

2016-09-20 Thread Steffen Nurpmeso
Hello again, yah, sorry, i'm back again.. I try to find a way to find the name of the current branch in an automated way, because i need to ensure that a commit happens on it and no other branch. Now the problem arises that the commit ref at the time of that commit maybe shared in between

[PATCH v3 3/3] mailinfo: handle in-body header continuations

2016-09-20 Thread Jonathan Tan
Mailinfo currently handles multi-line headers, but it does not handle multi-line in-body headers. Teach it to handle such headers, for example, for this input: From: author Date: Fri, 9 Jun 2006 00:44:16 -0700 Subject: a very long broken line Subject: another very

[PATCH v3 1/3] mailinfo: separate in-body header processing

2016-09-20 Thread Jonathan Tan
The check_header function contains logic specific to in-body headers, although it is invoked during both the processing of actual headers and in-body headers. Separate out the in-body header part into its own function. Signed-off-by: Jonathan Tan --- mailinfo.c | 33

[PATCH v3 2/3] mailinfo: make is_scissors_line take plain char *

2016-09-20 Thread Jonathan Tan
The is_scissors_line takes a struct strbuf * when a char * would suffice. Make it take char *. Signed-off-by: Jonathan Tan --- mailinfo.c | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/mailinfo.c b/mailinfo.c

[PATCH v3 0/3] handle multiline in-body headers

2016-09-20 Thread Jonathan Tan
Changes since v2: o Removed utf8 translation before scissors line check in check_inbody_header (I was thinking of support for encodings like UTF-16, but I guess those don't work with the current reencode_string anyway since it uses strlen internally) With the above change, it is actually no

2.10.0: git log --oneline prints gpg signatures in 4 lines

2016-09-20 Thread Leandro Lucarella
Hi, starting from 2.10.0 I noticed that when using git log --oneline, if commits are signed with GPG, now the signatures are printed too, and it takes 3 lines for the signature information + 1 line for the title of the commit, so suddenly --oneline became --fourline :) Is this really intended?

Re: [PATCH v2] ls-files: add pathspec matching for submodules

2016-09-20 Thread Brandon Williams
On Mon, Sep 19, 2016 at 4:21 PM, Junio C Hamano wrote: > > As the previous one that used a wrong (sorry) argument is not even > in 'next' yet, let's pretend that it never happened. It is OK to > still keep it and this patch as two separate steps, i.e. a topic > with two

[PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

2016-09-20 Thread Johannes Sixt
A recently introduced test checks the result of 'git status' after setting the executable bit on a file. This check does not yield the expected result when the filesystem does not support the executable bit (and core.filemode is false). Skip the test case. Signed-off-by: Johannes Sixt

[PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently

2016-09-20 Thread Johannes Sixt
The subdirectory 'sub' is created early in the test file. Later, a test case removes it during its clean-up actions. However, this test case is protected by POSIXPERM. Consequently, 'sub' remains when the POSIXPERM prerequisite is not satisfied. Later, a recently introduced test case creates 'sub'

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-20 Thread Jacob Keller
On Mon, Sep 19, 2016 at 6:37 PM, Jeff King wrote: > On Mon, Sep 19, 2016 at 04:40:22PM -0700, Josh Triplett wrote: > >> > - there are a non-trivial number of patches for other projects (JGIT, >> > EGIT, StGit, etc). This is somewhat unique to git, where we discuss >> > a

[PATCH] git-check-ref-format.txt: fixup documentation

2016-09-20 Thread Elia Pinto
die is not a standard shell function. Use a different shell code for the example. Signed-off-by: Elia Pinto --- Documentation/git-check-ref-format.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-check-ref-format.txt

Limitiations of git rebase --preserve-merges --interactive

2016-09-20 Thread Stefan Haller
The BUGS section of the git-rebase manpage says that editing or rewording commits "should work fine", but attempts to reorder commits usually don't do what you want. I'd like to know more about what does or doesn't work. For example, will squashing commits work? (I.e. using the "fixup" or

Re: [PATCH v3 0/8] Better heuristics make prettier diffs

2016-09-20 Thread Michael Haggerty
On 09/19/2016 07:27 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Michael Haggerty writes: >> >>> On 09/08/2016 01:25 AM, Junio C Hamano wrote: I'd move it temporarily to t4061 with a separate SQUASH??? at the tip for now, as I am

Re: Homebrew and Git

2016-09-20 Thread Heiko Voigt
Hi, On Sun, Sep 18, 2016 at 05:50:28PM +0200, Jonas Thiel wrote: > A while ago I have described my problem with Homebrew at the following > GitHub channel > (https://github.com/Homebrew/homebrew-core/issues/2970). In the > meanwhile, I believe that I my problem with Homebrew is based on an >

Re: Re: Homebrew and Git

2016-09-20 Thread Heiko Voigt
On Tue, Sep 20, 2016 at 01:02:28PM +0200, Heiko Voigt wrote: > Hi, > > On Sun, Sep 18, 2016 at 05:50:28PM +0200, Jonas Thiel wrote: > > A while ago I have described my problem with Homebrew at the following > > GitHub channel > > (https://github.com/Homebrew/homebrew-core/issues/2970). In the > >

Aw: Re: Homebrew and Git

2016-09-20 Thread Jonas Thiel
Hi Heiko, thanks for your reply on my issue. Here are the following outputs you asked for: git version git version 2.7.4 (Apple Git-66) hostname -f 0x6A6E73 whoami jns I have tried the Homebrew version of git, but no change in case of the issue. I just customized my system with the Mathias

Re: [PATCH v3 0/3] handle multiline in-body headers

2016-09-20 Thread Jeff King
On Tue, Sep 20, 2016 at 10:17:50AM -0700, Jonathan Tan wrote: > Changes since v2: > o Removed utf8 translation before scissors line check in > check_inbody_header (I was thinking of support for encodings like > UTF-16, but I guess those don't work with the current reencode_string > anyway

Re: What's cooking in git.git (Sep 2016, #05; Mon, 19)

2016-09-20 Thread Johannes Schindelin
Hi, On Mon, 19 Sep 2016, Junio C Hamano wrote: > * jk/rebase-i-drop-ident-check (2016-07-29) 1 commit > (merged to 'next' on 2016-08-14 at 6891bcd) > + rebase-interactive: drop early check for valid ident > > Even when "git pull --rebase=preserve" (and the underlying "git > rebase

Re: [PATCH v2] ls-files: add pathspec matching for submodules

2016-09-20 Thread Brandon Williams
>>> + >>> + if (item->flags & PATHSPEC_ONESTAR) { >>> + return WM_MATCH; >>> + } else if (item->magic & PATHSPEC_GLOB) { >>> + return wildmatch(pattern, string, >>> + WM_PATHNAME | >>> + (item->magic &

[PATCH v8 01/11] pkt-line: rename packet_write() to packet_write_fmt()

2016-09-20 Thread larsxschneider
From: Lars Schneider packet_write() should be called packet_write_fmt() as the string parameter can be formatted. Suggested-by: Junio C Hamano Signed-off-by: Lars Schneider --- builtin/archive.c| 4 ++--

[PATCH v8 03/11] run-command: move check_pipe() from write_or_die to run_command

2016-09-20 Thread larsxschneider
From: Lars Schneider Move check_pipe() to run_command and make it public. This is necessary to call the function from pkt-line in a subsequent patch. Signed-off-by: Lars Schneider --- run-command.c | 13 + run-command.h | 2 ++

[PATCH v8 06/11] pkt-line: add packet_write_gently()

2016-09-20 Thread larsxschneider
From: Lars Schneider packet_write_fmt_gently() uses format_packet() which lets the caller only send string data via "%s". That means it cannot be used for arbitrary data that may contain NULs. Add packet_write_gently() which writes arbitrary data and does not die in

Re: v2.9.3 and v2.10.0: `name-ref' HEAD gives wrong branch name

2016-09-20 Thread Steffen Nurpmeso
Hey. Bryan Turner wrote: |On Tue, Sep 20, 2016 at 9:23 AM, Steffen Nurpmeso \ |wrote: |> yah, sorry, i'm back again.. |> I try to find a way to find the name of the current branch in an |> automated way, because i need to ensure that a commit

Re: [PATCH tg/add-chmod+x-fix 1/2] t3700-add: create subdirectory gently

2016-09-20 Thread Thomas Gummerer
Hi Johannes, On 09/20, Johannes Sixt wrote: > The subdirectory 'sub' is created early in the test file. Later, a test > case removes it during its clean-up actions. However, this test case is > protected by POSIXPERM. Consequently, 'sub' remains when the POSIXPERM > prerequisite is not satisfied.

Re: [PATCH tg/add-chmod+x-fix 2/2] t3700-add: protect one --chmod=+x test with POSIXPERM

2016-09-20 Thread Thomas Gummerer
Hi Johannes, On 09/20, Johannes Sixt wrote: > A recently introduced test checks the result of 'git status' after > setting the executable bit on a file. This check does not yield the > expected result when the filesystem does not support the executable bit > (and core.filemode is false). Skip the

Re: v2.9.3 and v2.10.0: `name-ref' HEAD gives wrong branch name

2016-09-20 Thread Bryan Turner
On Tue, Sep 20, 2016 at 9:23 AM, Steffen Nurpmeso wrote: > Hello again, > > yah, sorry, i'm back again.. > I try to find a way to find the name of the current branch in an > automated way, because i need to ensure that a commit happens on > it and no other branch. Now the

[PATCH v8 09/11] convert: modernize tests

2016-09-20 Thread larsxschneider
From: Lars Schneider Use `test_config` to set the config, check that files are empty with `test_must_be_empty`, compare files with `test_cmp`, and remove spaces after ">" and "<". Please note that the "rot13" filter configured in "setup" keeps using `git config`

[PATCH v8 11/11] convert: add filter..process option

2016-09-20 Thread larsxschneider
From: Lars Schneider Git's clean/smudge mechanism invokes an external filter process for every single blob that is affected by a filter. If Git filters a lot of blobs then the startup time of the external filter processes can become a significant part of the overall Git

[PATCH v8 10/11] convert: make apply_filter() adhere to standard Git error handling

2016-09-20 Thread larsxschneider
From: Lars Schneider apply_filter() returns a boolean that tells the caller if it "did convert or did not convert". The variable `ret` was used throughout the function to track errors whereas `1` denoted success and `0` failure. This is unusual for the Git source where

[PATCH v8 07/11] pkt-line: add functions to read/write flush terminated packet streams

2016-09-20 Thread larsxschneider
From: Lars Schneider write_packetized_from_fd() and write_packetized_from_buf() write a stream of packets. All content packets use the maximal packet size except for the last one. After the last content packet a `flush` control packet is written.

Re: [PATCH 1/6] i18n: commit: mark message for translation

2016-09-20 Thread Jean-Noël AVILA
Signed-off-by: Vasco Almeida Signed-off-by: Jean-Noel Avila --- Instead of distillating change requests, I'd better do it by myself. Here is the reworked version of the patch. diff.c | 15 ++- 1 file changed, 10 insertions(+), 5

[PATCH v8 08/11] convert: quote filter names in error messages

2016-09-20 Thread larsxschneider
From: Lars Schneider Git filter driver commands with spaces (e.g. `filter.sh foo`) are hard to read in error messages. Quote them to improve the readability. Signed-off-by: Lars Schneider --- convert.c | 12 ++-- 1 file changed, 6

Re: Re: Homebrew and Git

2016-09-20 Thread John Keeping
On Tue, Sep 20, 2016 at 01:07:00PM +0200, Heiko Voigt wrote: > On Tue, Sep 20, 2016 at 01:02:28PM +0200, Heiko Voigt wrote: > > Hi, > > > > On Sun, Sep 18, 2016 at 05:50:28PM +0200, Jonas Thiel wrote: > > > A while ago I have described my problem with Homebrew at the following > > > GitHub

[PATCH v8 04/11] pkt-line: add packet_write_fmt_gently()

2016-09-20 Thread larsxschneider
From: Lars Schneider packet_write_fmt() would die in case of a write error even though for some callers an error would be acceptable. Add packet_write_fmt_gently() which writes a formatted pkt-line like packet_write_fmt() but does not die in case of an error. The

[PATCH v8 02/11] pkt-line: extract set_packet_header()

2016-09-20 Thread larsxschneider
From: Lars Schneider set_packet_header() converts an integer to a 4 byte hex string. Make this function locally available so that other pkt-line functions can use it. Signed-off-by: Lars Schneider --- pkt-line.c | 19 +-- 1

[PATCH v8 05/11] pkt-line: add packet_flush_gently()

2016-09-20 Thread larsxschneider
From: Lars Schneider packet_flush() would die in case of a write error even though for some callers an error would be acceptable. Add packet_flush_gently() which writes a pkt-line flush packet like packet_flush() but does not die in case of an error. The function is

Re: [PATCH] gitweb: use highlight's shebang detection

2016-09-20 Thread Jakub Narębski
W dniu 06.09.2016 o 21:00, Ian Kelling pisze: > The highlight binary can detect language by shebang when we can't tell > the syntax type by the name of the file. Was it something always present among highlight[1] binary capabilities, or is it something present only in new enough highlight app?

Re: 2.10.0: git log --oneline prints gpg signatures in 4 lines

2016-09-20 Thread Jeff King
On Tue, Sep 20, 2016 at 05:09:54PM +0200, Leandro Lucarella wrote: > Hi, starting from 2.10.0 I noticed that when using git log --oneline, > if commits are signed with GPG, now the signatures are printed too, and > it takes 3 lines for the signature information + 1 line for the title > of the

(Loans)

2016-09-20 Thread empd
Loan A legitimate loan firm based in the US.With our technology we can approve a suitable loan in minutes.We lend from 50,000 Rs to 10,000,000 Rs at just 3% interest rate with Flexible repayment over 1 to 30 years

Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information

2016-09-20 Thread Vasco Almeida
Hi Junio Hamano, I have sent some git-gui patches on May this year and I think it will add value to accepted them at some point: git-gui: i18n stuff and small fixes <1462704778-4722-1-git-send-email-vascomalme...@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg92780.html git-gui: