Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Colin Clark
> I'll post in the issues if appropriate: the question I have at the > moment is that the about box seems woefully out of date, as is "geeqie > --version". I am fairly sure I am compiling master HEAD. > Hi Klaus There have been quite a few updates to the repository recently, and maybe a few

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Josef Kufner
Git hooks are not the right tool for this task. It is better to run `git describe` during the build process to generate a version file, which will be compiled in and shown by `geeqie --version`. It is easy to automatically generate version.h with few #define statements or something like that and

[Geeqie-devel] Git repository workflow

2016-05-02 Thread Russel Winder
Hi, I have probably failed to correctly search the archive, but… Is the Git repository on www.geeqie.org the mainline and the one on GitHub (https://github.com/BestImageViewer/geeqie) a mirror or is the one on GitHub the mainline and the one on www.geeqie.org a mirror?  -- Russel.

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Josef Kufner
> Am Mo den 2. Mai 2016 um 18:53 schrieb Josef Kufner: >> Git hooks are not the right tool for this task. It is better to run `git >> describe` during the build process to generate a version file, which >> will be compiled in and shown by `geeqie --version`. > >> It is easy to automatically

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Klaus Ethgen
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, Am Mo den 2. Mai 2016 um 11:04 schrieb Russel Winder: > > I do manually sync them one between the other currently. So if you > > have > > a pull request on Github, it will work too currently. > > So I guess the Issues on this repository are

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Klaus Ethgen
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi Russel, Am Mo den 2. Mai 2016 um 8:56 schrieb Russel Winder: > Is the Git repository on www.geeqie.org the mainline and the one on > GitHub (https://github.com/BestImageViewer/geeqie) a mirror or is the > one on GitHub the mainline and the one

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Russel Winder
Klaus, Thanks for getting back to me quickly, much appreciated. On Mon, 2016-05-02 at 10:47 +0100, Klaus Ethgen wrote: > Hi Russel, > […] > > The one on www.geeqie.org is the main one. This is the one I currently have a clone of so I will stick with that, at least for now.   > I do manually

Re: [Geeqie-devel] Git repository workflow

2016-05-02 Thread Russel Winder
On Mon, 2016-05-02 at 11:18 +0100, Klaus Ethgen wrote: > […] > > Well, it is the only place, we have currently. Works for me. :-) […] > > Well, that is only in the head. If you checkout current released > version > 1.2.3, you have a actual version there. OK. I got confused because the master