Git


Goal is that all administrators can perform the necessary actions properly and according the project policies.

  • GUI + CLI

1. Repository

  1. https://github.com/WackoWiki/wackowiki <— main
  2. https://sourceforge.net/p/wackowiki/code/ <— mirror
  3. https://bitbucket.org/wackowiki/wackowiki/ <— dev

1.1. Legacy

interwiki.conf

  • Revision --> Mercurial
  • Commit --> Git

UPDATE doc_page SET body = REPLACE(body, 'source:default/', 'source:master/')

1.2. Layout

1.3. .gitattributes

* text eol=lf

*.png binary
*.gif binary
*.ico binary

.gitattributes export-ignore
.gitignore export-ignore
composer.json export-ignore
composer.lock export-ignore

1.4. .gitignore

# WackoWiki

/cache/*
!/cache/.htaccess
/cache/config/*
!/cache/config/.htaccess
/cache/feed/*
!/cache/feed/.htaccess
/cache/page/*
!/cache/page/.htaccess
/cache/query/*
!/cache/query/.htaccess
/cache/session/*
!/cache/session/.htaccess
/cache/template/*
!/cache/template/.htaccess

/file/backup/*
!/file/backup/.htaccess
/file/global/*
!/file/global/wacko_logo.png
/file/perpage/*
!/file/perpage/.htaccess
/file/thumb/*
!/file/thumb/.htaccess

# Eclipse IDE
.buildpath
.project
.settings/

# PHPStorm IDE
.idea
*.iml

If you are trying to ignore changes to a file that's already tracked in the repository (e.g. config.php file that you would need to change for your local environment but you would never want to check in these changes) than what you want to do is:

 git update-index --skip-worktree <file>

2. Differences to Mercurial

2.1. Purge the last commit

git reset --hard HEAD^
git push origin -f

git reset --hard 71c27777543ccfcb0376dcdd8f6777df055ef479
git push --force

a specific repo:

 git push https://git.... --force

2.2. Clone particular version of remote repository

git clone -b branch_or_tag_name repo_address_or_path

git clone -b 6.1.2 https://bitbucket.org/wackowiki/wackowiki.git

git clone -b 6.1.2 https://github.com/WackoWiki/wackowiki.git

2.3. Reset local repository branch to be just like remote repository HEAD

git fetch origin
git reset --hard origin/master

3. Github

3.1. Workflow

The “bread and butter” commands and concepts needed to work with a Github-hosted project.

3.2. Rational


Pro

  • almost all libs we use are on Github
  • API

Contra

  • lock-in
  • GitHub GUI no longer supports languages other than English.

3.3. Settings

Creating a personal access token
Personal access tokens function like ordinary OAuth access tokens. They can be used instead of a password for Git over HTTPS, or can be used to authenticate to the API over Basic Authentication.

4. Import from Mercurial

4.1. Settings

merge and rebase model

  1. Requiring a linear commit history
  2. Setting your commit email address
    • commit eae3fd3461492b2396b66f9d7d7441f611775005
      Author: vendeeglobe <54716082+vendeeglobe@users.noreply.github.com> 2019-08-24 17:28:56
      Committer: vendeeglobe <54716082+vendeeglobe@users.noreply.github.com> 2019-08-24 17:28:56

5. Workflow

create and merge feature branches

6. Testing

  1. merge pull requests
  2. strip an unwanted commit

7. CLI

You aren't allowed to read this page.

12. GUI Clients

12.1. IDE

https://wiki.eclipse.org/EGit/User_Guide


wackowiki eclipse workspace

13. Backup Solution

Mitigate lock-in

14. Resources

  1. Comparison of source-code-hosting facilities
  2. Comparison of version-control software

Files

feature_branches.png create and merge feature branches 18 KiB  13.07.2021 20:58