Re: [ANN][GAP] Gapcoin - Prime Gap Search - New Math Algo - CPU / GPU

Quote from: gjhiggins on December 02, 2019, 06:37:40 PM

I learned that git submodule update needs to be git submodule update --remote --merge

But, reading more extensively, I realised what I'd been missing. Previously, when looking at the status of the changes, I thought that git was offering me the option of including all of PoWCore in the main Gapcoin repos ... well, I mean, who wouldn't? ...

Code:

On branch v0.9.3-gap
Your branch is up-to-date with 'origin/v0.9.3-gap'.

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)

modified: src/PoWCore (new commits, untracked content)

no changes added to commit (use "git add" and/or "git commit -a")

But when I looked at the actual difference, it was offering to update the reference from:

Code:

ID : ca5e863b1ff6c0a9655fadb951f1d9653ba24ef1

Author : Jonny Frey
07/01/2015 22:43

Message:
1024 max shift should work for all

to:

Code:

ID : 5cdfb1fcdfe932cb10eab567048cb95d1fc13979

Author : Graham Higgins
26/10/2019 11:04

Committer: GitHub
26/10/2019 11:04

Message:
Update PoWUtils.h

Address compilation failure

which is actually what I wanted.

So I committed the change and the submodule update now works correctly as before, i.e. git submodule update and doesn't need the --remote --merge any longer.

We can all breathe a sigh of relief

Cheers,

Graham