Albert Lea Data Wiki

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.

====== General Git Topics ======

==== Basic Config ====
<code>git config --global user.name 'Your Name'
git config --global user.email 'your@email.com'
git config --global core.pager 'less -x3r'
git config --global diff.tool 'vimdiff'
git config --global diff.guitool 'gvimdiff'
git config --global difftool.prompt 'false'
git config --global http.sslverify 'false'</code>

==== Some history/view tips ====
  * Show files involved in a particular commit: <code>git diff-tree --no-commit-id --name-only -r commitid</code>
  * Show basic history for a file:<code>git log --all -- path/to/file.ext</code>
  * Show all pull/push activity:<code>git reflog show --date=iso origin/master</code>
  * Show commit hash and comment<code>git log --abbrev-commit --pretty=oneline 228d0ae de36d78
git log --pretty=oneline 228d0ae de36d78</code>
  * Show everything in the commit for hash<code>git show d9ekhg9alk239d94dkd949dksc0dkgkls90fds93</code>
  * Show commit info for hash<code>git show d9ekhg9alk239d94dkd949dksc0dkgkls90fds93 | head -6</code>
  * Show files changed for commit<code>git show d9ekhg9alk239d94dkd949dksc0dkgkls90fds93 | grep "^diff --git"</code>

==== Rename a tag ====
<code>
git tag new old
git tag -d old
git push origin :refs/tags/old
git push --tags
</code>
// The colon in the push command removes the tag from the remote repository. If you don't do this, git will create the old tag on your machine when you pull. // \\
 \\
Ensure that the other developers/users remove the deleted tag by running the following command:
<code>git pull --prune --tags</code>

 \\

------
====== GitLab ======
==== Import Project into Gitlab ====
<code>
git clone --mirror https://github.com/you/prj
cd prj.git
# HTTP URL http://gitlab.example.com/you/prj.git
git remote add gitlab git@git.albertleadata.org:you/prj.git
git push gitlab --mirror

# Switch local clone to new repo:
git remote remove origin
git remote add origin git@git.albertleadata.org:you/prj.git
git fetch --all
</code>

 \\

------
====== Github ======
===== Manage your fork's sync with upstream =====
  * Add the remote, call it "upstream":<code>git remote add upstream https://github.com/whoever/whatever.git</code>
  * Fetch all the branches of that remote into remote-tracking branches, such as upstream/master:<code>git fetch upstream</code>
  * Make sure that you're on your master branch:<code>git checkout master</code>
  * Rewrite your master branch so that any commits of yours that aren't already in upstream/master are replayed on top of that other branch:<code>git rebase upstream/master</code>//Alternately, you could do a ''git merge upstream/master'', but a rebase is most sane, especially for keeping pull requests well-behaved //

====== Advanced Topics ======
===== Locking master branch =====
  * In ./git/hooks/update before section # --- Config:<code>
	if [ "$refname" == "refs/heads/master" ]; then
		if [ "$USER" != "<someadminuser>" ]; then
			echo "POLICY: you are not allowed to change the master branch !"
			exit 1
		else
			echo "POLICY: $USER allowed to change the master branch ..."
		fi
	fi
</code>
  * ''git config receive.denyCurrentBranch ignore''
  * Edit .git/description

====== Miscellaneous Topics ======
===== Set active branch in bare repo =====
''git symbolic-ref HEAD refs/heads/thebranch''

===== Installing git-lfs on Ubuntu =====
  * Some basic pre-requisites: <code>apt install software-properties-common</code>
  * Set up repository: <code>curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash</code>
  * Install from repository: <code>apt install git-lfs</code>
  * Each user will need to do: ''git lfs install''


===== Git Service over HTTP/HTTPS =====
==== ... for Apache ====
First //(as root)//:<code>
mkdir -p /var/www/git
chown msamud1:apache /var/www/git
chmod 2750 /var/www/git
chcon -t httpd_sys_content_t /var/www/git
</code>
Then, create auth file with something like:  ''htpasswd -c /var/www/git/.htpasswd git'' //... prompted for password//

=== For anonymous read/write ... ===
In ''/etc/httpd/conf.d/git.conf'':<code>
# Git-smart HTTP/HTTPS back-end
SetEnv GIT_PROJECT_ROOT /var/www/git
SetEnv GIT_HTTP_EXPORT_ALL
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/

<Directory "/usr/libexec/git-core">
	Options +ExecCGI
	Require all granted
</Directory>

<LocationMatch "^/git/.*/git-receive-pack$">
	Order allow,deny
	Allow from all
</LocationMatch>
</code>


=== ... or, for anonymous read and authenticated write ... ===
In ''/etc/httpd/conf.d/git.conf'':<code>
# Git-smart HTTP/HTTPS back-end
SetEnv GIT_PROJECT_ROOT /var/www/git
SetEnv GIT_HTTP_EXPORT_ALL
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/

<Directory "/usr/libexec/git-core">
	Options +ExecCGI
	Require all granted
</Directory>

<LocationMatch "^/git/.*/git-receive-pack$">
	Order allow,deny
	AuthType Basic
	AuthName "Git Access"
	AuthUserFile /var/www/git/.htpasswd
	Require valid-user
#	Require group committers
</LocationMatch>
</code>


=== ... or, for authenticated read/write ... ===
In ''/etc/httpd/conf.d/git.conf'':<code>
# Git-smart HTTP/HTTPS back-end
SetEnv GIT_PROJECT_ROOT /var/www/git
SetEnv GIT_HTTP_EXPORT_ALL
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/

<Directory "/usr/libexec/git-core">
	Options +ExecCGI
	Order deny,allow
	AuthType Basic
	AuthName "Private Git Access"
	AuthUserFile /var/www/git/.htpasswd
	Require valid-user
</Directory>
</code>

=== ... or, for LDAP authentication ... ===
Ensure ''mod_ldap'' is installed, then in ''/etc/httpd/conf.d/git.conf'':
<code> 
<Directory "/usr/libexec/git-core">
	Options +ExecCGI
	Order deny,allow
	AuthType Basic
	AuthName "Private Git Access"
	AuthBasicProvider ldap
	AuthLDAPURL "ldap://cosmos.samudio.net/dc=samudio,dc=net?uid?sub?"
	Require valid-user
</Directory>
</code>

=== ... Active Directory AuthLDAPURL ... ===
<code>AuthLDAPURL "ldap://ad-ldap-prod.uhc.com/dc=ms,dc=ds,dc=uhc,dc=com?sAMAccountName?sub?(objectCategory=person)(objectClass=user)"</code>

=== ... add specific location auth ... ===
<code>
<LocationMatch "^/git/yourrepo.*">
... add same LDAP constructs, except for ...
	Require ldap-attribute sAMAccountName="yourlogin"
</LocationMatch>
</code>

 \\
// Links: [[tech:start|Tech Info]] ... [[tech:devops:start|Devops Info]] // \\
Albert Lea Data Wiki

User Tools

Site Tools

Page Tools
