[PATCH] tag: add --edit option

2018-02-01 Thread Nicolas Morey-Chaisemartin
Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin --- Documentation/git-tag.txt | 6 ++ builtin/tag.c | 11 +-- t/t7004-tag.sh| 34

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-02-01 Thread Eric Sunshine
On Wed, Jan 31, 2018 at 7:05 PM, Duy Nguyen wrote: > On Thu, Feb 1, 2018 at 4:04 AM, Eric Sunshine wrote: >> On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy >> wrote: >>> Dangerous/Unpopular >>> options could be hidden with the new "NOCOMPLETE" flag. >> >> I wonder if this option should b

Re: [PATCH] gitignore.txt: elaborate shell glob syntax

2018-02-01 Thread Duy Nguyen
On Wed, Jan 31, 2018 at 03:22:46PM -0800, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: Argh.. stray patches strike again. It's not supposed to be in this thread but in https://public-inbox.org/git/%3C20180130101351.GA761@ash%3E/ > > > `.gitignore` file). > > > > - - Otherwise, G

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-02-01 Thread Duy Nguyen
On Thu, Feb 1, 2018 at 6:18 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> The new command `git rebase --show-current-patch` is useful for seeing >> the commit related to the current rebase state. Some however may find >> the "git show" command behind it too limiting. You may want

Hello My Dear Friend,

2018-02-01 Thread Mrs.Zainab Ahmed
I have a business proposal in the tune of $10.2 Million USD for you to handle with me. I have opportunity to transfer this abandon fund to your bank account in your country which belongs to our client. I am inviting you in this transaction where this money can be shared between us at ratio of

[PATCH v2 1/3] perf/aggregate: add --subsection option

2018-02-01 Thread Christian Couder
This makes it easier to use the aggregate script on the command line, to get results from subsections. Previously setting GIT_PERF_SUBSECTION was needed for this purpose. Signed-off-by: Christian Couder --- t/perf/aggregate.perl | 33 - 1 file changed, 24 inserti

[PATCH v2 2/3] perf/aggregate: add --reponame option

2018-02-01 Thread Christian Couder
This makes it easier to use the aggregate script on the command line when one wants to get the "environment" fields set in the codespeed output. Previously setting GIT_REPO_NAME was needed for this purpose. Helped-by: Eric Sunshine Signed-off-by: Christian Couder --- t/perf/aggregate.perl | 15

[PATCH v2 3/3] perf/aggregate: sort JSON fields in output

2018-02-01 Thread Christian Couder
It is much easier to diff the output against a previous one when the fields are sorted. Helped-by: Philip Oakley Signed-off-by: Christian Couder --- t/perf/aggregate.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The only change compared to v1 is a typo fix suggested by Philip in t

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Eric Sunshine
On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > --- > diff --git a/builtin/tag.c b/builtin/tag.c > @@ -224,7 +2

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-02-01 Thread Duy Nguyen
On Thu, Feb 1, 2018 at 4:54 PM, Eric Sunshine wrote: > On Wed, Jan 31, 2018 at 7:05 PM, Duy Nguyen wrote: >> On Thu, Feb 1, 2018 at 4:04 AM, Eric Sunshine >> wrote: >>> On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy >>> wrote: Dangerous/Unpopular options could be hidden with

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Nicolas Morey-Chaisemartin
Le 01/02/2018 à 11:16, Eric Sunshine a écrit : > On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin > wrote: >> Add a --edit option whichs allows modifying the messages provided by -m or >> -F, >> the same way git commit --edit does. >> >> Signed-off-by: Nicolas Morey-Chaisemartin >> -

Re: Some rough edges of core.fsmonitor

2018-02-01 Thread Duy Nguyen
On Tue, Jan 30, 2018 at 6:16 AM, Ben Peart wrote: > > > On 1/29/2018 4:40 AM, Duy Nguyen wrote: >> >> On Sat, Jan 27, 2018 at 12:43:41PM +0100, Ævar Arnfjörð Bjarmason wrote: >>> >>> b) with fsmonitor >>> >>> $ time GIT_TRACE_PERFORMANCE=1 ~/g/git/git-status >>> 12:34:23.833625 read-cach

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Nicolas Morey-Chaisemartin
Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : > > Le 01/02/2018 à 11:16, Eric Sunshine a écrit : >> On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin >> wrote: >>> Add a --edit option whichs allows modifying the messages provided by -m or >>> -F, >>> the same way git comm

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Eric Sunshine
On Thu, Feb 1, 2018 at 5:43 AM, Nicolas Morey-Chaisemartin wrote: > Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : >> Le 01/02/2018 à 11:16, Eric Sunshine a écrit : >>> A little below this change is where launch_editor() is actually >>> invoked. If it fails for some reason, it prints:

Re: What's cooking in git.git (Jan 2018, #04; Wed, 31)

2018-02-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Feb 01 2018, Junio C. Hamano jotted: > * ab/wildmatch-tests (2018-01-30) 10 commits > - wildmatch test: mark test as EXPENSIVE_ON_WINDOWS > - test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite > - wildmatch test: create & test files on disk in addition to in-memory > - wildmatch test:

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-02-01 Thread Phillip Wood
On 31/01/18 09:30, Nguyễn Thái Ngọc Duy wrote: > > The new command `git rebase --show-current-patch` is useful for seeing > the commit related to the current rebase state. Some however may find > the "git show" command behind it too limiting. You may want to > increase context lines, do a diff tha

Re: What's cooking in git.git (Jan 2018, #04; Wed, 31)

2018-02-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Feb 01 2018, Junio C. Hamano jotted: > * nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits > - dir.c: stop ignoring opendir() error in open_cached_dir() > - update-index doc: note a fixed bug in the untracked cache > - dir.c: fix missing dir invalidation in untracked code > -

[PATCH v3 0/2] wrap format-patch diffstats around 72 columns

2018-02-01 Thread Nguyễn Thái Ngọc Duy
v3 fixes tests in 2/2 that I overlooked (but Jeff didn't). Interdiff: diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index 1e62333b46..6e2cf933f7 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -19,17 +19,33 @@ test_expect_success 'preparation' ' git commi

[PATCH v3 1/2] format-patch: keep cover-letter diffstat wrapped in 72 columns

2018-02-01 Thread Nguyễn Thái Ngọc Duy
We already wrap shortlog around 72 columns in cover letters. Do the same for diffstat (also in cover letters). Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 46b4ca13e5..96af897403

[PATCH v3 2/2] format-patch: reduce patch diffstat width to 72

2018-02-01 Thread Nguyễn Thái Ngọc Duy
Patches generated by format-patch are meant to be exchanged as emails, most of the time. And since it's generally agreed that text in mails should be wrapped around 70 columns or so, make sure these diffstat follow the convention (especially when used with --cover-letter since we already defaults t

[PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

2018-02-01 Thread Nguyễn Thái Ngọc Duy
Changes since v2 [1]: - goes back to my original version (yay!) where the extra info is appended after the path name. More is described in 2/2 - --compact-summary is now renamed --stat-with-summary and implies --stat - 1/2 is just a cleanup patch to make it easier to add 2/2 [1] https://publi

[PATCH v3 1/2] diff.c: refactor pprint_rename() to use strbuf

2018-02-01 Thread Nguyễn Thái Ngọc Duy
Instead of passing char* around, let function handle strbuf directly. All callers already use strbuf internally. This helps kill the "not free" exception in free_diffstat_info(). I don't think this code is so critical that we need to avoid some free() calls. The other benefit comes in the next pa

[PATCH v3 2/2] diff: add --stat-with-summary

2018-02-01 Thread Nguyễn Thái Ngọc Duy
Certain information is currently shown with --summary, but when used in combination with --stat it's a bit hard to read since info of the same file is in two places (--stat and --summary). On top of that, commits that add or remove files double the number of display lines, which could be a lot if

t3404.6 breaks on master under GIT_FSMONITOR_TEST

2018-02-01 Thread Ævar Arnfjörð Bjarmason
The GIT_FSMONITOR_TEST variable allows you to roundtrip the fsmonitor codpath in the whole test suite. On both Debian & CentOS this breaks for me: (cd t && GIT_FSMONITOR_TEST=$PWD/t7519/fsmonitor-all ./t3404-rebase-interactive.sh -i) Whereas this works: (cd t && GIT_FSMONITOR_TEST=$PWD/

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Nicolas Morey-Chaisemartin
Le 01/02/2018 à 11:56, Eric Sunshine a écrit : > On Thu, Feb 1, 2018 at 5:43 AM, Nicolas Morey-Chaisemartin > wrote: >> Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : >>> Le 01/02/2018 à 11:16, Eric Sunshine a écrit : A little below this change is where launch_editor() is actua

Re: [PATCH] tag: add --edit option

2018-02-01 Thread Ramsay Jones
On 01/02/18 09:49, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > --- > Documentation/git-tag.txt | 6 ++ > builtin/tag.c

Respond for details

2018-02-01 Thread Mr. Allen
Dear sir/ madam Do you need a loan to pay off bills ? To pay off your mortgage quickly ? To set up a new business or to Re- finance your existing business ? I can help you secure a private loan at 3% interest rate please respond for more details Thanks Allen

[no subject]

2018-02-01 Thread Charles Stanley
Guess you are fine? I have been trying to reach you!

Respond for details

2018-02-01 Thread Mr. Allen
Dear sir/ madam Do you need a loan to pay off bills ? To pay off your mortgage quickly ? To set up a new business or to Re- finance your existing business ? I can help you secure a private loan at 3% interest rate please respond for more details Thanks Allen

[PATCHv2] tag: add --edit option

2018-02-01 Thread Nicolas Morey-Chaisemartin
Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin --- Changes since v1: - Fix usage string - Use write_script to generate editor - Rename editor to fakeeditor to match the other tests in t

Re: [PATCH v2 08/27] connect: discover protocol version outside of get_remote_heads

2018-02-01 Thread Brandon Williams
On 01/31, Derrick Stolee wrote: > On 1/25/2018 6:58 PM, Brandon Williams wrote: > > In order to prepare for the addition of protocol_v2 push the protocol > > version discovery outside of 'get_remote_heads()'. This will allow for > > keeping the logic for processing the reference advertisement for

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Jeff Hostetler
On 1/2/2018 7:18 PM, Brandon Williams wrote: Introduce git-serve, the base server for protocol version 2. Protocol version 2 is intended to be a replacement for Git's current wire protocol. The intention is that it will be a simpler, less wasteful protocol which can evolve over time. Protoco

[PATCH] cocci: simplify check for trivial format strings

2018-02-01 Thread René Scharfe
353d84c537 (coccicheck: make transformation for strbuf_addf(sb, "...") more precise) added a check to avoid transforming calls with format strings which contain percent signs, as that would change the result. It uses embedded Python code for that. Simplify this rule by using the regular expression

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Stefan Beller
On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler wrote: > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: >> >> Introduce git-serve, the base server for protocol version 2. >> >> Protocol version 2 is intended to be a replacement for Git's current >> wire protocol. The intention is that it will b

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Jeff Hostetler
On 2/1/2018 1:57 PM, Stefan Beller wrote: On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler wrote: On 1/2/2018 7:18 PM, Brandon Williams wrote: Introduce git-serve, the base server for protocol version 2. [...] + Special Packets +- + +In protocol v2 these special packets w

Re: [PATCH 12/26] ls-refs: introduce ls-refs server command

2018-02-01 Thread Jeff Hostetler
On 1/2/2018 7:18 PM, Brandon Williams wrote: Introduce the ls-refs server command. In protocol v2, the ls-refs command is used to request the ref advertisement from the server. Since it is a command which can be requested (as opposed to mandatory in v1), a client can sent a number of paramete

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-02-01 Thread Eric Sunshine
On Thu, Feb 1, 2018 at 5:21 AM, Duy Nguyen wrote: > On Thu, Feb 1, 2018 at 4:54 PM, Eric Sunshine wrote: >> I don't see that as convincing argument for two classes of "no >> complete". Since git-completion.bash already special-cases >> rebase/am/cherry-pick for --continue|--abort|--skip, it is no

Re: [PATCHv3 0/4] blame: (dim rep. metadata lines or fields, decay date coloring)

2018-02-01 Thread Ævar Arnfjörð Bjarmason
On Thu, Jan 04 2018, Stefan Beller jotted: > Stefan Beller (4): > color.h: document and modernize header > builtin/blame: dim uninteresting metadata > builtin/blame: add option to color metadata fields separately > builtin/blame: highlight recently changed lines I like this feature in pr

Re: [PATCH v2 00/27] protocol version 2

2018-02-01 Thread Jeff Hostetler
On 1/25/2018 6:58 PM, Brandon Williams wrote: Changes in v2: * Added documentation for fetch * changes #defines for state variables to be enums * couple code changes to pkt-line functions and documentation * Added unit tests for the git-serve binary as well as for ls-refs [...] This

RE: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Randall S. Becker
On February 1, 2018 1:58 PM, Stefan Beller wrote: > On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler > wrote: > > > > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: > >> > >> Introduce git-serve, the base server for protocol version 2. > >> > >> Protocol version 2 is intended to be a replacement

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Brandon Williams
On 02/01, Jeff Hostetler wrote: > > > On 2/1/2018 1:57 PM, Stefan Beller wrote: > > On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler > > wrote: > > > > > > > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: > > > > > > > > Introduce git-serve, the base server for protocol version 2. > [...] >

Good Morning !

2018-02-01 Thread Anny
Good Morning , I have a project i would like to bring to you and i want you to help me discuss it. please let me know if you will be available for this project. Thanks

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread 'Brandon Williams'
On 02/01, Randall S. Becker wrote: > On February 1, 2018 1:58 PM, Stefan Beller wrote: > > On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler > > wrote: > > > > > > > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: > > >> > > >> Introduce git-serve, the base server for protocol version 2. > > >> > >

Re: [PATCHv3 0/4] blame: (dim rep. metadata lines or fields, decay date coloring)

2018-02-01 Thread Stefan Beller
On Thu, Feb 1, 2018 at 11:29 AM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Jan 04 2018, Stefan Beller jotted: > >> Stefan Beller (4): >> color.h: document and modernize header >> builtin/blame: dim uninteresting metadata >> builtin/blame: add option to color metadata fields separately >>

RE: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Randall S. Becker
On February 1, 2018 3:08 PM, Brandon Williams wrote: > On 02/01, Randall S. Becker wrote: > > On February 1, 2018 1:58 PM, Stefan Beller wrote: > > > On Thu, Feb 1, 2018 at 10:48 AM, Jeff Hostetler > > > > > > wrote: > > > > > > > > > > > > On 1/2/2018 7:18 PM, Brandon Williams wrote: > > > >> > >

Good Morning !

2018-02-01 Thread Anny
Good Morning , I have a project i would like to bring to you and i want you to help me discuss it. please let me know if you will be available for this project. Thanks

Re: [PATCH 11/26] serve: introduce git-serve

2018-02-01 Thread Stefan Beller
On Thu, Feb 1, 2018 at 12:37 PM, Randall S. Becker wrote: >> I think that it would be too much of a change to up to 1MB lines at the >> moment so I'm planning on leaving it right where it is :) > > In for a kilo, in for a tonne. Once we're way up there, it's not a problem > or much of a differenc

[RFC/PATCH] reset --hard: make use of the pretty machinery

2018-02-01 Thread Thomas Gummerer
reset --hard currently uses its own logic for printing the first line of the commit message in its output. Instead of just using the first line, use the pretty machinery to create the output. In addition to the easier to follow code, this makes the output more consistent with other commands that

Re: [PATCH v2 01/14] commit-graph: add format document

2018-02-01 Thread Jonathan Tan
On Tue, 30 Jan 2018 16:39:30 -0500 Derrick Stolee wrote: > + Commit Data (ID: {'C', 'G', 'E', 'T' }) (N * (H + 16) bytes) > +* The first H bytes are for the OID of the root tree. > +* The next 8 bytes are for the int-ids of the first two parents > + of the ith commit. Stores value 0

Re: [PATCH v2 00/12] object_id part 11 (the_hash_algo)

2018-02-01 Thread Stefan Beller
On Wed, Jan 31, 2018 at 6:18 PM, brian m. carlson wrote: > This series includes various changes to adopt the use of the_hash_algo > for abstracting hash algorithms away. This series looks good to me. > > Changes from v1: > * Fix comments referring to SHA-1. > * Switch hash function wrappers to t

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

2018-02-01 Thread Jonathan Tan
On Tue, 30 Jan 2018 16:39:33 -0500 Derrick Stolee wrote: > +#define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */ > +#define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */ > +#define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */ > +#define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */ > +#define GRAPH_

Re: [PATCH 5/5] dir.c: stop ignoring opendir() error in open_cached_dir()

2018-02-01 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Nguyễn Thái Ngọc Duy jotted: > A follow-up to the recently fixed bugs in the untracked > invalidation. If opendir() fails it should show a warning, perhaps > this should die, but if this ever happens the error is probably > recoverable for the user, and dying would just make

2 conflicts referencing the same path?

2018-02-01 Thread Bryan Turner
While investigating an issue with rendering conflicts on a pull request, I noticed that the merge was producing this output (sanitized for paths) $ git merge --no-ff --log -m "Test" 190a25b6e0f32c7b8ccddf8c31e054149dece8b7 CONFLICT (rename/add): Rename A->B in HEAD. B added in 190a25b6e0f32c7b8ccd

Git on Windows maps creation time onto changed time

2018-02-01 Thread Keith Goldfarb
Dear git, While tracking down a problem with a filesystem shared by Windows and Ubuntu, I came across the following code in compat/mingw.c (ming_fstat(), also in do_lstat()): if (GetFileInformationByHandle(fh, &fdata)) { buf->st_ino = 0; buf->st_gid = 0;

Re: Git on Windows maps creation time onto changed time

2018-02-01 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 2, 2018 at 12:10 AM, Keith Goldfarb wrote: > Dear git, > > While tracking down a problem with a filesystem shared by Windows and Ubuntu, > I came across the following code in compat/mingw.c (ming_fstat(), also in > do_lstat()): > > if (GetFileInformationByHandle(fh, &fdata))

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

2018-02-01 Thread Jonathan Tan
On Tue, 30 Jan 2018 16:39:34 -0500 Derrick Stolee wrote: > diff --git a/Documentation/git-commit-graph.txt > b/Documentation/git-commit-graph.txt > index c8ea548dfb..3f3790d9a8 100644 > --- a/Documentation/git-commit-graph.txt > +++ b/Documentation/git-commit-graph.txt > @@ -5,3 +5,21 @@ NAME >

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

2018-02-01 Thread SZEDER Gábor
> Teach Git to write a commit graph file by checking all packed objects > to see if they are commits, then store the file in the given pack > directory. > > Signed-off-by: Derrick Stolee > --- > Makefile | 1 + > commit-graph.c | 376 > ++

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

2018-02-01 Thread SZEDER Gábor
> Teach git-commit-graph to write graph files. Create new test script to verify > this command succeeds without failure. > > Signed-off-by: Derrick Stolee > --- > Documentation/git-commit-graph.txt | 18 +++ > builtin/commit-graph.c | 30 > t/t5318-commit-graph.sh

Re: [PATCH v2 06/14] commit-graph: implement git-commit-graph --read

2018-02-01 Thread SZEDER Gábor
> Teach git-commit-graph to read commit graph files and summarize their > contents. > > Use the --read option to verify the contents of a commit graph file in the > tests. > > Signed-off-by: Derrick Stolee > --- > Documentation/git-commit-graph.txt | 7 ++ > builtin/commit-graph.c

Re: [PATCH v2 06/14] commit-graph: implement git-commit-graph --read

2018-02-01 Thread Jonathan Tan
On Tue, 30 Jan 2018 16:39:35 -0500 Derrick Stolee wrote: > Teach git-commit-graph to read commit graph files and summarize their > contents. One overall question - is the "read" command meant to be a command used by the end user, or is it here just to test that some aspects of reading works? If

Re: 2 conflicts referencing the same path?

2018-02-01 Thread Elijah Newren
Hi, On Thu, Feb 1, 2018 at 3:00 PM, Bryan Turner wrote: > While investigating an issue with rendering conflicts on a pull > request, I noticed that the merge was producing this output (sanitized > for paths) > > $ git merge --no-ff --log -m "Test" 190a25b6e0f32c7b8ccddf8c31e054149dece8b7 > CONFLI

Re: [PATCH v2 03/14] commit-graph: create git-commit-graph builtin

2018-02-01 Thread SZEDER Gábor
> diff --git a/Documentation/git-commit-graph.txt > b/Documentation/git-commit-graph.txt > new file mode 100644 > index 00..c8ea548dfb > --- /dev/null > +++ b/Documentation/git-commit-graph.txt > @@ -0,0 +1,7 @@ > +git-commit-graph(1) > + Here the length of the '' must mat

Re: [PATCHv2] tag: add --edit option

2018-02-01 Thread Eric Sunshine
On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > --- > Changes since v1: > - Fix usage string > - Use write_scr

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-02-01 Thread SZEDER Gábor
> It is possible to have multiple commit graph files in a pack directory, > but only one is important at a time. Use a 'graph_head' file to point > to the important file. This implies that all those other files are ignored, right? > Teach git-commit-graph to write 'graph_head' upon > writing a ne

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

2018-02-01 Thread SZEDER Gábor
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > new file mode 100755 > index 00..6bcd1cc264 > --- /dev/null > +++ b/t/t5318-commit-graph.sh > @@ -0,0 +1,96 @@ > +#!/bin/sh > + > +test_description='commit graph' > +. ./test-lib.sh > + > +test_expect_success 'setup full rep

Re: [PATCH v2 11/14] commit: integrate commit graph with commit parsing

2018-02-01 Thread Jonathan Tan
On Tue, 30 Jan 2018 16:39:40 -0500 Derrick Stolee wrote: > +/* global storage */ > +struct commit_graph *commit_graph = 0; NULL, not 0. > +static int bsearch_graph(struct commit_graph *g, struct object_id *oid, > uint32_t *pos) > +{ > + uint32_t last, first = 0; > + > + if (oid->hash[0

how to ignore whitespace changes with --color-moved (git diff move detection)?

2018-02-01 Thread Timothee Cour
this PR from october 2017 was discussing a patch that'd introduce `--color-moved-[no-]ignore-space-change` https://public-inbox.org/git/20171025224620.27657-3-sbel...@google.com/ however not sure what happened since then as I can't find in `git help diff` options even after `brew install --HEAD gi

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-02-01 Thread SZEDER Gábor
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > index da565624e3..d1a23bcdaf 100755 > --- a/t/t5318-commit-graph.sh > +++ b/t/t5318-commit-graph.sh > @@ -107,6 +112,9 @@ test_expect_success 'setup bare repo' \ > test_expect_success 'write graph in bare repo' \ > 'graphbar

Re: [PATCH v2 08/14] commit-graph: implement git-commit-graph --clear

2018-02-01 Thread SZEDER Gábor
> Teach Git to delete the current 'graph_head' file and the commit graph > it references. And will it leave other, non-important graph files behind? Looking at the code it indeed does. What is the use case for keeping the non-important graph files? > This is a good safety valve if somehow the f

[PATCH v1 1/5] submodule foreach: correct '$path' in nested submodules from a subdirectory

2018-02-01 Thread Prathamesh Chavan
When running 'git submodule foreach' from a subdirectory of your repository, nested submodules get a bogus value for $sm_path: For a submodule 'sub' that contains a nested submodule 'nested', running 'git -C dir submodule foreach echo $path' would report path='../nested' for the nested submodule. T

[PATCH v1 4/5] submodule foreach: document variable '$displaypath'

2018-02-01 Thread Prathamesh Chavan
It was observed that the variable '$displaypath' was accessible but undocumented. Hence, document it. Discussed-with: Ramsay Jones Signed-off-by: Stefan Beller Signed-off-by: Prathamesh Chavan --- Documentation/git-submodule.txt | 6 -- t/t7407-submodule-foreach.sh| 22 +++

[PATCH v1 3/5] submodule foreach: clarify the '$toplevel' variable documentation

2018-02-01 Thread Prathamesh Chavan
It does not contain the topmost superproject as the author assumed, but the direct superproject, such that $toplevel/$sm_path is the actual absolute path of the submodule. Discussed-with: Ramsay Jones Signed-off-by: Stefan Beller Signed-off-by: Prathamesh Chavan --- Documentation/git-submodule

[PATCH v1 0/5] Incremental rewrite of git-submodules

2018-02-01 Thread Prathamesh Chavan
Following series of patches focuses on porting submodule subcommand git-foreach from shell to C. An initial attempt for porting was introduced about 9 months back, and since then then patches have undergone many changes. Some of the notable discussion thread which I would like to point out is: [1]

[PATCH v1 2/5] submodule foreach: document '$sm_path' instead of '$path'

2018-02-01 Thread Prathamesh Chavan
As using a variable '$path' may be harmful to users due to capitalization issues, see 64394e3ae9 (git-submodule.sh: Don't use $path variable in eval_gettext string, 2012-04-17). Adjust the documentation to advocate for using $sm_path, which contains the same value. We still make the 'path' variabl

[PATCH v1 5/5] submodule: port submodule subcommand 'foreach' from shell to C

2018-02-01 Thread Prathamesh Chavan
This aims to make git-submodule foreach a builtin. This is the very first step taken in this direction. Hence, 'foreach' is ported to submodule--helper, and submodule--helper is called from git-submodule.sh. The code is split up to have one function to obtain all the list of submodules. This functi

Re: [PATCH v1 0/5] Incremental rewrite of git-submodules: git-foreach

2018-02-01 Thread Prathamesh Chavan
Since due to some reason, the previous patch-series list was unavailable on the mailing list, I have re-posted the series. It is available at: https://public-inbox.org/git/20180202045745.5076-1-pc44...@gmail.com/ Thanks, Prathamesh Chavan

[PATCH] rebase: add --allow-empty-message option

2018-02-01 Thread Genki Sky
--> Motivation commit 4bee95847 ("cherry-pick: add --allow-empty-message option", 2012-08-02) started doing this work, but it was never completed. For more discussion on why this approach was chosen, see the thread beginning here: https://public-inbox.org/git/2012080658.ga21...@arachsys.com

Re: how to ignore whitespace changes with --color-moved (git diff move detection)?

2018-02-01 Thread Jeff King
On Thu, Feb 01, 2018 at 06:13:52PM -0800, Timothee Cour wrote: > this PR from october 2017 was discussing a patch that'd introduce > `--color-moved-[no-]ignore-space-change` > https://public-inbox.org/git/20171025224620.27657-3-sbel...@google.com/ > > however not sure what happened since then as

Re: [RFC/PATCH] reset --hard: make use of the pretty machinery

2018-02-01 Thread Jeff King
On Thu, Feb 01, 2018 at 08:57:21PM +, Thomas Gummerer wrote: > It is a slight change of the output if the second line of the commit > message is not a blank line, i.e. if the commit message is > > foo > bar > > previously we would print "HEAD is now at 00 foo", while after > this