Re: Git 2.15.0 on OSX 10.12.6: gui multi-select stage

Hi Matthew, On Fri, 5 Jan 2018, Matthew Orres wrote: > I'd be glad to give it a try - but am unfamiliar with how portable a > manual build of Git can be used along side the version I have > installed via Homebrew - do I just use full paths to reference the > compiled executable from within my rep

Re: [PATCH] rebase -p: fix quoting when calling `git merge`

Hi Junio, On Fri, 5 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > git-rebase--interactive.sh | 9 ++--- > > t/t3418-rebase-continue.sh | 14 ++ > > 2 files changed, 20 insertions(+), 3 deletions(-) > > > > diff --git a/git-rebase--interactive.sh b/git-reb

Re: Can't squash merge with merge.ff set to false

On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote: > On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey > wrote: > > Not sure if this is intended or a bug, but with the following > > configuration: > > > > $ git config --global merge.ff false > > > > I am not able to merge my topic branch into

Re: [PATCH 1/3] Tighten and correct a few testcases for merging and cherry-picking

Hi Elijah, On Fri, 5 Jan 2018, Elijah Newren wrote: > t3501 had a testcase originally added in 05f2dfb965 (cherry-pick: > demonstrate a segmentation fault, 2016-11-26) to ensure cherry-pick > wouldn't segfault when working with a dirty file involved in a rename. > > While the segfault was fixed,

Re: [PATCH 2/3] merge-recursive: fix logic ordering issue

Hi Elijah, On Fri, 5 Jan 2018, Elijah Newren wrote: > merge_trees() did a variety of work, including: > * Calling get_unmerged() to get unmerged entries > * Calling record_df_conflict_files() with all unmerged entries to > do some work to ensure we could handle D/F conflicts correctly >

Re: [PATCH 3/3] merge-recursive: add explanation for src_entry and dst_entry

Hi Elijah, On Fri, 5 Jan 2018, Elijah Newren wrote: > If I have to walk through the debugger and inspect the values found in > here in order to figure out their meaning, despite having known these > things inside and out some years back, then they probably need a comment > for the casual reader t

Re: [PATCH] perf: amend the grep tests to test grep.threads

On Thu, Jan 04 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Ever since 5b594f457a ("Threaded grep", 2010-01-25) the number of >> threads git-grep uses under PTHREADS has been hardcoded to 8, but >> there's no performance test to check whether this is an optimal >> settin

Re: Bug report: git clone with dest

Hi Peff, On Fri, 5 Jan 2018, Jeff King wrote: > On Fri, Jan 05, 2018 at 09:22:07PM +0100, Johannes Schindelin wrote: > > > On Fri, 5 Jan 2018, Isaac Shabtay wrote: > > > > > Done: https://github.com/git-for-windows/git/pull/1421 > > > > > > I added credit to Jeff in the PR's description. > >

Re: Can't squash merge with merge.ff set to false

On Fri, Jan 5, 2018 at 2:54 PM, Bryan Turner wrote: > The two _aren't_ distinctly separate, though. "git merge --squash > --ff-only" has very different semantics to "git merge --squash --ff", > in that it will only create a new squashed commit (or fast-forward a > single commit) if the incoming co

Re: Git 2.15.0 on OSX 10.12.6: gui multi-select stage

Beautiful! Pulled down that commit, was able to build and can confirm the issue is fixed in git gui! This has been a thorn in my side, so I appreciate your help! I look forward to it being included in the next release for git in Homebrew! :) On Fri, Jan 5, 2018 at 4:41 PM, Johannes Schindelin w

[PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

Skip the newly added file creation tests on Windows proper, these already work under Cygwin, but as that involves a significant emulation layer the results are different under Windows proper with MinGW. Ideally we'd get exhaustive coverage for this area on all platforms, but having any increase in

Re: [BUG] v2.16.0-rc0 seg faults when git bisect skip

Yasushi SHOJI writes: > The patch (actually, I've tested the one in pu, 2e9fdc795cb27) avoids > the seg fault for sure, but the question is: > > When does the list allowed to contain NULLs? A very legitimate question. With the proposed log message alone, it is even tempting to declare that the

Re: [PATCH 6/6] fsmonitor: Use fsmonitor data in `git diff`

Johannes Schindelin writes: >> diff --git a/diff-lib.c b/diff-lib.c >> index 8104603a3..13ff00d81 100644 >> --- a/diff-lib.c >> +++ b/diff-lib.c >> @@ -95,6 +95,9 @@ int run_diff_files(struct rev_info *revs, unsigned int >> option) >> >> diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/"

Re: [PATCH] perf: amend the grep tests to test grep.threads

Ævar Arnfjörð Bjarmason writes: >> Judging by the way the other side uses "test_perf $prereq ..." >> without quotes around it, I suspect you do expect it to be empty in >> some cases. It means you expect test_have_prereq is prepared to >> skip an empty prerequisite in a prereq list, but I do not

Re: Bug report: git clone with dest

Jeff King writes: > On Fri, Jan 05, 2018 at 12:45:03PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > Out of curiosity, did this change at some point? I thought the process >> > used to be to merge to maint, and then pick up topics in master by >> > merging maint to master. >> >>

Re: [PATCH v4 8/7] wildmatch test: skip file creation tests on Windows proper

Ævar Arnfjörð Bjarmason writes: > Skip the newly added file creation tests on Windows proper, these > already work under Cygwin, but as that involves a significant > emulation layer the results are different under Windows proper with > MinGW. > ... > diff --git a/t/t3070-wildmatch.sh b/t/t3070-w

Hello Dear

-- Hello Dear, Its me Ruth, did you receive my previous email? please write me back immediately to let me know, i wait to hear back from you, kisses.

Re: [PATCH 1/5] convert_to_git(): checksafe becomes an integer

Lars Schneider writes: >> On 31 Dec 2017, at 09:05, tbo...@web.de wrote: >> >> From: Torsten Bögershausen >> >> When calling convert_to_git(), the checksafe parameter has been used to >> check if commit would give a non-roundtrip conversion of EOL. >> >> When checksafe was introduced, 3 value

What's cooking in git.git (Jan 2018, #01; Fri, 5)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The tip of 'master' has been tagge

[ANNOUNCE] Git v2.16.0-rc1

A release candidate Git v2.16.0-rc1 is now available for testing at the usual places. It is comprised of 455 non-merge commits since v2.15.0, contributed by 79 people, 23 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following pu

Re: [PATCH 01/26] pkt-line: introduce packet_read_with_status

On 01/03, Stefan Beller wrote: > On Tue, Jan 2, 2018 at 4:18 PM, Brandon Williams wrote: > > The current pkt-line API encodes the status of a pkt-line read in the > > length of the read content. An error is indicated with '-1', a flush > > with '0' (which can be confusing since a return value of

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

On 01/03, Stefan Beller wrote: > On Tue, Jan 2, 2018 at 4: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 man

Re: [PATCH 20/26] fetch-pack: perform a fetch using v2

On 01/03, Stefan Beller wrote: > On Tue, Jan 2, 2018 at 4:18 PM, Brandon Williams wrote: > > + > > +#define FETCH_CHECK_LOCAL 0 > > +#define FETCH_SEND_REQUEST 1 > > +#define FETCH_PROCESS_ACKS 2 > > +#define FETCH_SEND_HAVES 3 > > +#define FETCH_GET_PACK 4 > > +#define FETCH_DONE 5 > > + > > +sta

Re: Can't squash merge with merge.ff set to false

Hi, Robert Dailey wrote: > Not sure if this is intended or a bug, but with the following configuration: > > $ git config --global merge.ff false > > I am not able to merge my topic branch into master with squash option: > > $ git checkout master > $ git merge --squash topic > fatal: You cannot co

[PATCH v2] stash: don't delete untracked files that match pathspec

Currently when 'git stash push -- ' is used, untracked files that match the pathspec will be deleted, even though they do not end up in a stash anywhere. This is because the original commit introducing the pathspec feature in git stash push (df6bba0937 ("stash: teach 'push' (and 'create_stash') to

[PATCH v3 0/7] convert: add support for different encodings

From: Lars Schneider Hi, Patches 1-5 and 6 are helper functions and preparation. Patch 6 is the actual change. I am still torn between "checkout-encoding" and "working-tree-encoding" as attribute name. I am happy to hear arguments for/against one or the other. Changes since v2: * Added Torste

[PATCH v3 5/7] convert_to_git(): safe_crlf/checksafe becomes int conv_flags

From: Torsten Bögershausen When calling convert_to_git(), the checksafe parameter defined what should happen if the EOL conversion (CRLF --> LF --> CRLF) does not roundtrip cleanly. In addition, it also defined if line endings should be renormalized (CRLF --> LF) or kept as they are. checksafe w

[PATCH v3 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

From: Lars Schneider Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we allocate the buffer for the lower case string with xmallocz(). This already ensures a NUL at the end of the allocated buffer. Remove the unnecessary assignment. Signed-off-by: Lars Schneider --- strbu

[PATCH v3 6/7] convert: add support for 'checkout-encoding' attribute

From: Lars Schneider Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git web front ends do not visu

[PATCH v3 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

From: Lars Schneider Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE or UTF-32LE a BOM must not be used [1]. The function returns true if this is the case. This function is used in a subsequent commit. [1] http://unicode.org/faq/utf_bom.html#bom10 Signed-off-by: Lars Schn

[PATCH v3 2/7] strbuf: add xstrdup_toupper()

From: Lars Schneider Create a copy of an existing string and make all characters upper case. Similar xstrdup_tolower(). This function is used in a subsequent commit. Signed-off-by: Lars Schneider --- strbuf.c | 12 strbuf.h | 1 + 2 files changed, 13 insertions(+) diff --git a/

[PATCH v3 7/7] convert: add tracing for checkout-encoding

From: Lars Schneider Add the GIT_TRACE_CHECKOUT_ENCODING environment variable to enable tracing for content that is reencoded with the checkout-encoding attribute. Signed-off-by: Lars Schneider --- convert.c| 28 t/t0028-checkout-encoding.sh |

[PATCH v3 4/7] utf8: add function to detect a missing UTF-16/32 BOM

From: Lars Schneider If the endianness is not defined in the encoding name, then let's be strict and require a BOM to avoid any encoding confusion. The has_missing_utf_bom() function returns true if a required BOM is missing. The Unicode standard instructs to assume big-endian if there in no BOM

Re: [PATCH 1/5] convert_to_git(): checksafe becomes an integer

> On 06 Jan 2018, at 00:22, Junio C Hamano wrote: > > Lars Schneider writes: > >>> On 31 Dec 2017, at 09:05, tbo...@web.de wrote: >>> >>> From: Torsten Bögershausen >>> >>> When calling convert_to_git(), the checksafe parameter has been used to >>> check if commit would give a non-roundtrip

Hey

Loan Offer at 3% Lowest Rate Get Now.

Re: Bug report: git clone with dest

On Fri, Jan 05, 2018 at 02:37:25PM -0800, Junio C Hamano wrote: > Well, MaintNotes on the 'todo' branch needs a bit of updating, as it > says something somewhat misleading. > > -- >8 -- > Subject: MaintNotes: clarify the purpose of maint->master upmerge Yup, this makes sense. Thanks for clarifyi

Gruß

Gruß In einer kurzen Einführung bin ich Barrister Clark Harrison, aus Portugal, aber jetzt lebe ich in London, ich habe Ihnen eine E-Mail über Ihre verstorbene Verwandte Familie geschickt, aber ich habe keine Antwort von Ihnen erhalten, verstorben ist ein Bürger Ihres Landes mit derselbe Nachname

<    1   2