Re: [PATCH 00/12] object_id part 9

"brian m. carlson" writes: > It is possible there will be some other conflicts with in flight topics, > as get_sha1 is commonly used in the codebase. This is unavoidable to > some extent, but should be kept in mind. My experience is that usually > the required

Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

Stefan Beller writes: > On Tue, Jul 4, 2017 at 3:50 PM, Ævar Arnfjörð Bjarmason > wrote: > >> >> I think some invocation of "git submodule update ???" will do the same, >> but I can't from the docs see what that is right now. > > '--remote' is what you are

Re: Truncating HEAD reflog on branch move

Jeff King writes: > On Tue, Jul 04, 2017 at 07:58:06PM +, brian m. carlson wrote: > >> > And here's one more patch on top of those that's necessary to get the >> > tests to pass (I don't expect anybody to necessarily be applying this >> > slow string of patches; it's just to

Re: "git intepret-trailers" vs. "sed script" to add the signature

Kaartic Sivaraam writes: > On Mon, 2017-07-03 at 09:58 -0700, Junio C Hamano wrote: >> Kaartic Sivaraam writes: >> >> > I'll send a typical patch that uses "git interpret-headers" as a >> > follow-up. >> >> When you say a

Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

On Tue, Jul 4, 2017 at 3:50 PM, Ævar Arnfjörð Bjarmason wrote: > > I think some invocation of "git submodule update ???" will do the same, > but I can't from the docs see what that is right now. '--remote' is what you are looking for. When we have the branch field configured,

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

On Mon, Jul 3, 2017 at 11:02 PM, Junio C Hamano wrote: > "Philip Oakley" writes: > >> From: "Junio C Hamano" >> >>> I am not sure what you are asking. Is this the command you are >>> looking for? >>> >>> $ grep -e "^[[*]"

Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

On Tue, Jul 04 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00..cbeebdab7a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule

Re: Truncating HEAD reflog on branch move

On Tue, Jul 04, 2017 at 09:27:09PM +, brian m. carlson wrote: > On Tue, Jul 04, 2017 at 05:24:08PM -0400, Jeff King wrote: > > On Tue, Jul 04, 2017 at 07:58:06PM +, brian m. carlson wrote: > > > I've looked at your original patch, which modified reflog-walk.c, and it > > > does fix the

Re: Truncating HEAD reflog on branch move

On Tue, Jul 04, 2017 at 05:24:08PM -0400, Jeff King wrote: > On Tue, Jul 04, 2017 at 07:58:06PM +, brian m. carlson wrote: > > I've looked at your original patch, which modified reflog-walk.c, and it > > does fix the issue. I'm happy to send in a patch with that and a test > > (provided

Re: Truncating HEAD reflog on branch move

On Tue, Jul 04, 2017 at 07:58:06PM +, brian m. carlson wrote: > > And here's one more patch on top of those that's necessary to get the > > tests to pass (I don't expect anybody to necessarily be applying this > > slow string of patches; it's just to show the direction I'm looking in). > >

Re: Why doesn't merge fail if message has only sign-off?

On Mon, 2017-07-03 at 10:21 -0700, Junio C Hamano wrote: > I think that it is not by design that it doesn't fail.  It's not > like we decided to allow s-o-b only merge because we found a reason > why it is a good idea to do so. > > So I do not think anybody minds too deeply if somebody came up a

Re: Help needed for solving a few issues with building git

On Mon, 2017-07-03 at 11:13 -0700, Junio C Hamano wrote: > Adding HTTPS support > > >  > > > I tried to add HTTP/HTTPS support to the custom built version > > > for which > > > AFAIK 'git' depends on 'curl'. I tried providing the location > > > of the > > > 

Re: Truncating HEAD reflog on branch move

On Thu, Jun 22, 2017 at 11:13:15PM -0400, Jeff King wrote: > On Thu, Jun 22, 2017 at 06:25:46PM -0400, Jeff King wrote: > > > So here's a patch on top of what I posted before that pushes the reflog > > check into the loop (it just decides whether to pull from the reflogs or > > from the commit

Re: "git intepret-trailers" vs. "sed script" to add the signature

On Mon, 2017-07-03 at 09:58 -0700, Junio C Hamano wrote: > Kaartic Sivaraam writes: > > > So, it seems that excepting for 'commit' it has quite a nice > > spacing. I > > guess we could add something like the following to fix that, > > > > # Add new line after

Re: [PATCH] push: add config option to --force-with-lease by default.

Francesco Mazzoli writes: > The flag can be overridden with `--no-force-with-lease`, or by > passing the config via the command line. > > Signed-off-by: Francesco Mazzoli > --- > Documentation/config.txt | 5 + > builtin/push.c | 3 +++ > cache.h

Re: [PATCH v2] add --signoff flag to `git-merge` command.

Ævar Arnfjörð Bjarmason writes: > On Tue, Jul 04 2017, Łukasz Gryglicki jotted: > >> add --signoff flag to `git-merge` command. > > We'd usually say this as: > > merge: add a --signoff flag > > Or something like that. I thought I gave a fairly complete example that can be

Re: [PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

Ævar Arnfjörð Bjarmason writes: >>> diff --git a/.gitmodules b/.gitmodules >>> new file mode 100644 >>> index 00..cbeebdab7a >>> --- /dev/null >>> +++ b/.gitmodules >>> @@ -0,0 +1,4 @@ >>> +[submodule "sha1collisiondetection"] >>> + path = sha1collisiondetection >>> +

Re: [PATCH 06/12] builtin/update_ref: convert to struct object_id

On Mon, Jul 03, 2017 at 10:49:39PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Mon, Jul 03 2017, brian m. carlson jotted: > > [...] > > 1 file changed, 34 insertions(+), 35 deletions(-) > > [...] > > struct strbuf err = STRBUF_INIT; > > char *refname; > > - unsigned char new_sha1[20]; >

Re: Flurries of 'git reflog expire'

On Tue, Jul 04 2017, Andreas Krey jotted: > Hi everyone, > > how is 'git reflog expire' triggered? We're occasionally seeing a lot > of the running in parallel on a single of our repos (atlassian bitbucket), > and this usually means that the machine is not very responsive for > twenty minutes,

[PATCH v3] merge: add a --signoff flag.

Some projects require every commit to be signed off. Our workflow is to create feature branches and require every commit to be signed off. When feature is finally approved we need to merge it into master. Merge itself is usually trivial and is done by `git merge origin/master`. Unfortunatelly

LOAN

UNSECURED BUSINESS/PERSONAL LOAN BY LOAN CAPITAL FINANCE - NO COLLATERAL - MINIMUM DOCUMENTATION - BUSINESS LOAN UP TO FIVE(5) MILLION US DOLLARS CONTACT US TODAY VIA EMAIL: loancapi...@outlook.in

Re: [PATCH v2] add --signoff flag to `git-merge` command.

On Tue, Jul 04 2017, Łukasz Gryglicki jotted: > add --signoff flag to `git-merge` command. We'd usually say this as: merge: add a --signoff flag Or something like that. > Some projects require every commit to be signed off. > Our workflow is to create feature branches and require every

Re: Should "head" also work for "HEAD" on case-insensitive FS?

On Tue, Jul 04 2017, Konstantin Khomoutov jotted: > On Tue, Jul 04, 2017 at 12:00:49AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> I don't have a OSX box, but was helping a co-worker over Jabber the >> other day, and he pasted something like: >> >> $ git merge-base github/master head >> >>

Flurries of 'git reflog expire'

Hi everyone, how is 'git reflog expire' triggered? We're occasionally seeing a lot of the running in parallel on a single of our repos (atlassian bitbucket), and this usually means that the machine is not very responsive for twenty minutes, the repo being as big as it is. The server is still on

Re: Should "head" also work for "HEAD" on case-insensitive FS?

On Tue, Jul 04, 2017 at 12:00:49AM +0200, Ævar Arnfjörð Bjarmason wrote: > I don't have a OSX box, but was helping a co-worker over Jabber the > other day, and he pasted something like: > > $ git merge-base github/master head > > Which didn't work for me, and I thought he had a local "head"

[PATCH v2] add --signoff flag to `git-merge` command.

Some projects require every commit to be signed off. Our workflow is to create feature branches and require every commit to be signed off. When feature is finally approved we need to merge it into master. Merge itself is usually trivial and is done by `git merge origin/master`. Unfortunatelly this

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

"Philip Oakley" writes: > From: "Junio C Hamano" > >> I am not sure what you are asking. Is this the command you are >> looking for? >> >> $ grep -e "^[[*]" whats-cooking.txt >> > Ah, thanks. > > It does presume that one has extracted the email to the