Re: [PATCH 23/26] t5500, t5539: tests for shallow depth excluding a ref

2016-06-04 Thread Eric Sunshine
On Wed, Apr 13, 2016 at 8:55 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh > @@ -661,4 +661,26 @@ test_expect_success 'fetch shallow since ...' ' > +test_expect_success 'fetch exclude tag one' ' > + g

Re: [PATCH 22/26] clone: define shallow clone boundary with --shallow-exclude

2016-06-04 Thread Eric Sunshine
On Wed, Apr 13, 2016 at 8:55 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/builtin/clone.c b/builtin/clone.c > @@ -44,6 +44,7 @@ static int deepen; > +static struct string_list option_not = STRING_LIST_INIT_NODUP; > @@ -52,6 +53,13 @@ static struct str

Re: [PATCH 21/26] fetch: define shallow boundary with --shallow-exclude

2016-06-04 Thread Eric Sunshine
On Wed, Apr 13, 2016 at 8:55 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/builtin/fetch.c b/builtin/fetch.c > @@ -41,6 +41,7 @@ static int max_children = 1; > +static struct string_list deepen_not = STRING_LIST_INIT_NODUP; > @@ -50,6 +51,13 @@ static

[PATCH v2 3/3] am: support --patch-format=mboxrd

2016-06-04 Thread Eric Wong
Combined with "git format-patch --pretty=mboxrd", this should allow us to round-trip commit messages with embedded mbox "From " lines without corruption. Signed-off-by: Eric Wong --- Documentation/git-am.txt | 3 ++- builtin/am.c | 14 +++--- t/t4150-am.sh| 20 ++

[PATCH v2 2/3] mailsplit: support unescaping mboxrd messages

2016-06-04 Thread Eric Wong
This will allow us to parse the output of --pretty=mboxrd and the output of other mboxrd generators. Signed-off-by: Eric Wong --- Documentation/git-mailsplit.txt | 7 ++- builtin/mailsplit.c | 18 ++ t/t5100-mailinfo.sh | 31 ++

[PATCH v2 1/3] pretty: support "mboxrd" output format

2016-06-04 Thread Eric Wong
This output format prevents format-patch output from breaking readers if somebody copy+pasted an mbox into a commit message. Unlike the traditional "mboxo" format, "mboxrd" is designed to be fully-reversible. "mboxrd" also gracefully degrades to showing extra ">" in existing "mboxo" readers. Thi

[PATCH v2 0/3] support mboxrd format

2016-06-04 Thread Eric Wong
Changes since v2: * beef up tests, including accounting for the trailing whitespace omission in pretty output but still accepting and preserving trailing whitespace in mailsplit. * indicate disabling variable interpolation in heredoc (but using variable interpolation as needed for trailing

Re: [PATCH 18/26] t5500, t5539: tests for shallow depth since a specific date

2016-06-04 Thread Eric Sunshine
On Wed, Apr 13, 2016 at 8:55 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh > @@ -73,5 +73,31 @@ test_expect_success 'no shallow lines after receiving ACK > ready' ' > ) > ' > > +te

Re: Creating empty commits with --intent-to-add

2016-06-04 Thread Duy Nguyen
On Sun, Jun 5, 2016 at 12:54 AM, Thomas Braun wrote: > Hi, > > the following procedure > > mkdir test > cd test > git init > echo 1 >file > git add --intent-to-add file > git commit -m "blurb" > > results in a commit. I would have expected that git commit complains, > as I have not pased the --all

Re: [PATCH v2 3/3] fetch: reduce duplicate in ref update status lines

2016-06-04 Thread Duy Nguyen
On Sat, Jun 4, 2016 at 11:30 PM, Junio C Hamano wrote: >> The patch does not do fancy stuff like this yet, but it can because >> lines exceeding terminal width is already excluded from column width >> calculation. So far the output looks good on my terminal (192 chars, >> can't overflow or refname

[PATCH v3 4/6] fetch: align all "remote -> local" output

2016-06-04 Thread Nguyễn Thái Ngọc Duy
We do align "remote -> local" output by allocating 10 columns to "remote". That produces aligned output only for short refs. An extra pass is performed to find the longest remote ref name (that does not produce a line longer than terminal width) to produce better aligned output. Signed-off-by: Ngu

[PATCH v3 6/6] fetch: reduce duplicate in ref update status lines with placeholder

2016-06-04 Thread Nguyễn Thái Ngọc Duy
In the "remote -> local" line, if either ref is a substring of the other, the common part in the other string is replaced with "$". For example abc-> origin/abc refs/pull/123/head -> pull/123 become abc -> origin/$ refs/$/head -> pull/123 Activated with f

[PATCH v3 5/6] fetch: reduce duplicate in ref update status lines with { -> }

2016-06-04 Thread Nguyễn Thái Ngọc Duy
Most of the time, ref update lines are variable-long-name -> fixed-remote/variable-long-name With fetch.output set to "compact" such a line will be shown as { -> fixed-remote}/variable-long-name This keeps the output aligned (because the variable part is always at the end) and reduce du

[PATCH v3 1/6] git-fetch.txt: document fetch output

2016-06-04 Thread Nguyễn Thái Ngọc Duy
This documents the ref update status of fetch. The structure of this output is defined in [1]. The ouput content is refined a bit in [2] [3] [4]. This patch is a copy from git-push.txt, modified a bit because the flag '-' means different things in push (delete) and fetch (tag update). PS. For cod

[PATCH v3 3/6] fetch: change flag code for displaying tag update and deleted ref

2016-06-04 Thread Nguyễn Thái Ngọc Duy
This makes the fetch flag code consistent with push, where '-' means deleted ref. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-fetch.txt | 4 ++-- builtin/fetch.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-fetch.txt b/Docum

[PATCH v3 0/6] Better ref summary alignment in "git fetch"

2016-06-04 Thread Nguyễn Thái Ngọc Duy
This is so people can play with new output format... v3 adds one extra pass to calculate width (4/6) and swap flag code 'x' and '-' with '-' and 't' to align with push flag code (3/6). These are definitely good improvements. 5/6 and 6/6 add two new formats "{ -> origin}/abc" and "abc -> origin/$".

[PATCH v3 2/6] fetch: refactor ref update status formatting code

2016-06-04 Thread Nguyễn Thái Ngọc Duy
This makes it easier to change the formatting later. And it makes sure translators cannot mess up format specifiers and break Git. There are a couple call sites where the length of the second column is TRANSPORT_SUMMARY_WIDTH instead of calculated by TRANSPORT_SUMMARY(), which is enforced now. The

Hi git

2016-06-04 Thread bolaji jibodu
hey git http://anilambulanceservicesdelhi.com/whatever.php?largest=1evvn57g1pz1vu bolaji jibodu -- 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: What's cooking in git.git (Jun 2016, #01; Thu, 2)

2016-06-04 Thread Mike Hommey
On Sat, Jun 04, 2016 at 04:51:28PM +0200, Torsten Bögershausen wrote: > On 2016-06-04 07.14, Mike Hommey wrote: > > On Fri, Jun 03, 2016 at 04:47:33PM -0700, Junio C Hamano wrote: > >> Mike Hommey writes: > >> > >>> In fact, the parser doesn't even reject the one that is considered > >>> invalid (

Creating empty commits with --intent-to-add

2016-06-04 Thread Thomas Braun
Hi, the following procedure mkdir test cd test git init echo 1 >file git add --intent-to-add file git commit -m "blurb" results in a commit. I would have expected that git commit complains, as I have not pased the --allow-empty option. Is that intended behaviour? Tested with 2.8.3.windows.1 an

Re: [PATCH v2 3/3] fetch: reduce duplicate in ref update status lines

2016-06-04 Thread Junio C Hamano
Duy Nguyen writes: >> Peff suggested that a two-pass approach might not be too bad, but had >> problems when he tried it with extra-long refs. Maybe those problems >> could be dealt with, and we could get a simple, aligned output? > > The good thing about 2/3 is we can customize the output eas

Re: What's cooking in git.git (Jun 2016, #01; Thu, 2)

2016-06-04 Thread Junio C Hamano
Mike Hommey writes: > From my POV, the desired outcome from this patch series is that there is > no change of behavior, and Torsten's fix makes > git://[example.com:123]:/path/to/repo urls handled the same before and > after the patch series. OK. I somehow suspect nobody cares too much about wh

[RFC/PATCH] push: deny policy to prevent pushes to unwanted remotes.

2016-06-04 Thread Antoine Queru
Currently, a user wanting to prevent accidental pushes to the wrong remote has to create a pre-push hook. The feature offers a configuration to allow users to prevent accidental pushes to the wrong remote. The user may define a list of whitelisted remotes, a list of blacklisted remotes and a defau

Re: What's cooking in git.git (Jun 2016, #01; Thu, 2)

2016-06-04 Thread Torsten Bögershausen
On 2016-06-04 07.14, Mike Hommey wrote: > On Fri, Jun 03, 2016 at 04:47:33PM -0700, Junio C Hamano wrote: >> Mike Hommey writes: >> >>> In fact, the parser doesn't even reject the one that is considered >>> invalid (the first). >> >> My question was what the desired behaviour is, and if your "fix"

[PATCH v3] gitk: Fix missing commits when using -S or -G

2016-06-04 Thread Stefan Dotterweich
When -S or -G is used as a filter option, the resulting commit list rarely contains all matching commits. Only a certain number of commits are displayed and the rest are missing. "git log --boundary -S" does not return as many boundary commits as you might expect. gitk makes up for this in closeva