Git on Miro's World

How to monitor Bitbucket user and group permissions with API

Thu, 18 Feb 2021 13:00:00 +0800

How to manage users and groups in Bitbucket
#

Use case:

I want to maintain users and groups and their access to repositories in an organization in Bitbucket. To make sure I do not miss newly changed admin access, I want to use the Bitbucket API to retrieve the list of permissions on repository basis and on user/group bases.

How to mirror Github and Bitbucket repositories

Wed, 17 Feb 2021 13:00:00 +0800

Mirroring large number of GitHub or Bitbucket repositories
#

Use case:

I want to create local clone of a large number of repositories from an organization in GitHub / Bitbucket.

Assumptions
#

user has SSH key registered with the GH / BB - can clone using ssh protocol
user has successfully cloned at least one repo from command line before (the /etc/hosts contains host entries for BB and GH)
user has modern version of Python 3 installed (3.6 or better)
user has local installation of a reasonably modern Git

Steps
#

First I use the ./bb-repo-links.sh and ./gh-repo-links.sh to generate list of repositories. See these blog articles: How to list repositories in Bitbucket and How to list repositories in github

How to list Github repositories and users

Tue, 16 Feb 2021 13:00:00 +0800

How to list repositories in GitHub
#

Use Case:

I want to maintain repositories in an organization in GitHub. To make sure I do not miss newly added ones, I want to use API access to retrieve the list of repositories in the organization.

Setup
#

GitHub requires a token to access the API. This token is stored in an environment variable github_token and can be generated in the user profile section - settings - developer settings.

How to list Bitbucket repositories and users

Mon, 15 Feb 2021 13:00:00 +0800

How to list repositories in Bitbucket
#

Use case:

I want to maintain repositories in an organization in Bitbucket. To make sure I do not miss newly added ones, I want to use API access to retrieve the list of all repositories in the organization.

Setup
#

Bitbucket requires a username and password to access the API. This information is stored in the environment variables BBUSER and BBPASSWORD. The BBPASSWORD should be an access token / app password defined in the App passwords section of the user settings:

Using SSH keys with multiple Bitbucket accounts

Tue, 12 May 2020 22:34:38 +0800

I have been using Bitbucket since 2012, long before my company moved from in-house hosted server running Gitolite and in-house instances of FishEye and Crucible to cloud based source control on Bitbucket Cloud. As legacy I was using my personal login with my gmail account as my Bitbucket identity.

With merge of 3 companies in 2018 and rebranding as Pivotree, we are in process of streamlining the identity management and using SSO for identification. Time has come to split my personal identity and work identity.

Building Hugo as well on GitLab pages

Sat, 23 Nov 2019 22:22:48 +0800

Parallel building challenges
#

Unlike Github, Gitlab considers Hugo blogs first class citizens and does not impose any restrictions on repo naming.

I had 3 challenges to overcome related to co-existence of GH and GL versions:

I need to use same repo for both GH and GL
the submodule link for public does not work on GL
the site root is different - I have no custom domain forward for GitLab

Using same repo
#

To separate the GH and GL, I have added 2 remotes to repo and special branch gitlab-pages.

Gitbits

Mon, 14 Jan 2019 11:22:48 +0800

Two small utilities I have places into ~/bin:

git-attic
#

Source: https://github.com/maximeh/dotfiles/blob/master/common/.bin/git-attic

#!/bin/sh
# git-attic [-M] [PATH] - list deleted files of Git repositories
#
# Use -M to not show renamed files, and other git-log options as you like.

git log --raw --no-renames --date=short --format="%h %cd" "$@" |
  awk '/^[0-9a-f]/ { commit=$1; date=$2 }
       /^:/ && $5 == "D" { print date, commit "^:" $6 }' |
  less

Example
#

➜  kubernetes-the-hard-way git:(master) ✗ git log --raw --no-renames --date=short --format="%h %cd" "$@" |
  awk '/^[0-9a-f]/ { commit=$1; date=$2 }
       /^:/ && $5 == "D" { print date, commit "^:" $6 }'
2019-11-20 374e8d9^:docs/using-rst/pdp-template-rst.rst
2019-11-17 7911114^:src/certificates/admin-csr.json
2019-11-17 7911114^:src/certificates/admin-key.pem
2019-11-17 7911114^:src/certificates/admin.csr
2019-11-17 7911114^:src/certificates/admin.pem
2019-11-17 7911114^:src/certificates/ca-config.json
2019-11-17 7911114^:src/certificates/ca-csr.json
2019-11-17 7911114^:src/certificates/ca-key.pem
2019-11-17 7911114^:src/certificates/ca.csr
2019-11-17 7911114^:src/certificates/ca.pem
2019-11-17 7911114^:src/certificates/copy-certificates-to-servers.sh

git trail
#

I cannot remember where is this one from :-(

Storing sensitive information in Git

Wed, 17 May 2017 11:22:48 +0800

The purpose of this is to evaluate options and suggest possible approaches for handling the sensitive information in Git repositories such as database credentials, API credentials, passwords, keys, certificates etc. Joel asked this question a few weeks ago - this is part of Milos’s security awareness program.

The issue
#

Git repos store in cleartext all credentials, that may also be including PROD credentials.

Managing code in remote SVN repo

Wed, 10 May 2017 11:22:48 +0800

This is based on J.’s’ question in Slack:

Do we have some customer where we are moving a git repo to svn in an automated fashion I just need to move the git repo into svn periodically nightly

The setup (as I understand it):

on client side we have a worktree that is Git repository
the files needs to be copied to SVN regularly

Options
#

Use git-svn bridge
#

Git client allows to “pretend” it is SVN and pull/push against remote SVN repo

Process for transferring Git repo from Gitolite to Bitbucket

Wed, 02 Nov 2016 11:22:48 +0800

Task
#

Transfer full Git history (all branches, tags, etc) to Bitbucket so that development can continue from there

User setup
#

List all keys in Gitolite
must have access to Gitolite admin interface

cd $ADMIN_HOME/pensieve/PRJ-admin/gitolite-admin
 
 
➜  gitolite-admin git:(master) ll keydir
total 144K
-rw-r--r-- 1 miro 401 Jun 29  2015 alter.pub
-rw-r--r-- 1 miro 397 Jun 29  2015 codereview.pub
-rw-r--r-- 1 miro 400 Apr 18  2016 hybris.pub
-rw-r--r-- 1 miro 400 Apr 19  2016 hybris2.pub
-rw-r----- 1 miro 398 Mar 30  2016 irae.pub
... DELETED ...
-rw-r--r-- 1 miro 401 Jun 29  2015 miro.pub
-rw-r--r-- 1 miro 411 Jun 29  2015 tkuser.jenkins0.pub
-rw-r--r-- 1 miro 411 Jun 29  2015 tkuser.jenkins2.pub

These will be split to 5 usergroups

Update all local branches in Git repo

Mon, 05 Sep 2016 11:22:48 +0800

Update all local branches in Git repo
#

Issue: The git pull updates just one current branch.

In DevOps I am following many Git repos and need to keep up to date for all local branches.

git ffwd-update command
#

Source: http://stackoverflow.com/questions/4318161/can-git-pull-all-update-all-my-local-branches

Create file named git-ffwd-update somewhere on the path (in my case ~/bin)

Learning resources for Linux and Command line

Mon, 30 May 2016 11:22:48 +0800

This quick summary to answer Megha Maiya’s question - I am adding to the Wiki in case it can be expanded later useful for somebody else:

expanded later
useful for somebody else

Free resources
#

There is HUGE amount of resources available for Linux and Unix out there. The issue is select those reasonably good

List of lists: https://github.com/learnbyexample/scripting_course/blob/master/Linux_curated_resources.md
http://ryanstutorials.net/, specially http://ryanstutorials.net/linuxtutorial/ and http://ryanstutorials.net/linuxtutorial/
http://www.tutorialspoint.com/unix/unix-getting-started.htm
(bash scripting) - https://bash.cyberciti.biz/guide/Main_Page
free book - http://unixmages.com/ufbm.pdf - very beginner friendly
list of free books: http://www.dailyartisan.com/news/open-source-e-books-for-linux/
Eli The computer guy - https://www.youtube.com/playlist?list=PLD6B6473ACF32C59D (I like this one)
YouTube channel - ultimate Linux tutorials - https://www.youtube.com/channel/UCn58SGUDUnUHRYKyNffHQrQ (from a generous Indian guy sharing his experience with the world for free. Not ideal audio quality, could use some editing - bot has lots of content)
EDX courses - https://www.edx.org/school/linuxfoundationx
http://www.tutorialspoint.com/listtutorials/linux/basic-concepts/1
Wikibooks - https://en.wikibooks.org/wiki/LPI_Linux_Certification

Hands On
#

Reading books and watching videos will have very little impact without trying things out.

Git bits 2

Wed, 23 Mar 2016 12:57:35 -0500

Using the Scala source repo to demonstrate - see Github

Show merged and unmerged branches
#

This command allows you to show all local branches merged / unmerged to current branch

➜  scala git:(2.12.x) git branch -a --merged
* 2.12.x
  remotes/origin/2.11.x
  remotes/origin/2.12.x
  remotes/origin/HEAD -> origin/2.12.x

➜  scala git:(2.12.x) git branch -a --no-merged
  remotes/origin/2.10.x
  remotes/origin/2.8.x
  remotes/origin/2.9.x
  remotes/origin/DarkDimius-patch-1
  remotes/origin/gh-pages
  remotes/origin/legacy/msil

This shows you all local branches merged into named branch:

Git - find unmerged commits

Tue, 22 Mar 2016 12:57:35 -0500

This is Ruby script I found way back and was using it since.

The credits for creation goes to Zach Dennis. The script is decribed in his blog post

The source is here

Example
#

This is beginning of very long output from Groovy source

The code
#

#!/usr/bin/env ruby

require 'rubygems'

gem 'term-ansicolor', '>=1.0.5'
require 'term/ansicolor'

class GitCommit
  attr_reader :content

  def initialize(content)
    @content = content
  end

  def sha
    @content.split[1]
  end

  def to_s
    `git log --pretty=format:"%h %ad %an - %s" #{sha}~1..#{sha}`
  end

  def unmerged?
    content =~ /^\+/
  end

  def equivalent?
    content =~ /^\-/
  end
end

class GitBranch
  attr_reader :name, :commits

  def initialize(name, commits)
    @name = name
    @commits = commits
  end

  # Returns origin from origin/some/branch/here
  def repository
    name.split("/", 2).first
  end

  # Returns some/branch/here from origin/some/branch/here
  def branch_name
    name.split("/", 2).last
  end

  def unmerged_commits
    commits.select{ |commit| commit.unmerged? }
  end

  def equivalent_commits
    commits.select{ |commit| commit.equivalent? }
  end

end

class GitBranches < Array
  def self.clean_branch_output(str)
    str.split(/\n/).map{ |e| e.strip.gsub(/\*\s+/, '') }.reject{ |branch| branch =~ /\b#{Regexp.escape(UPSTREAM)}\b/ }.sort
  end

  def self.local_branches
    clean_branch_output `git branch`
  end

  def self.remote_branches
    clean_branch_output `git branch -r`
  end

  def self.load(options)
    git_branches = new
    branches = if options[:local]
      local_branches
    elsif options[:remote]
      remote_branches
    end

    branches.each do |branch|
      raw_commits = `git cherry -v #{UPSTREAM} #{branch}`.split(/\n/).map{ |c| GitCommit.new(c) }
      git_branches << GitBranch.new(branch, raw_commits)
    end
    git_branches
  end

  def unmerged
    reject{ |branch| branch.commits.empty? }.sort_by{ |branch| branch.name }
  end

  def any_missing_commits?
    select{ |branch| branch.commits.any? }.any?
  end
end

class GitUnmerged
  VERSION = "1.1"

  include Term::ANSIColor

  attr_reader :branches

  def initialize(args)
    @options = {}
    @branches_to_prune = []
    extract_options_from_args(args)
  end

  def load
    @branches ||= GitBranches.load(:local => local?, :remote => remote?)
    @branches.reject!{|b| @options[:exclude].include?(b.name)} if @options[:exclude].is_a?(Array)
    @branches.select!{|b| @options[:only].include?(b.name)} if @options[:only].is_a?(Array)
  end

  def print_overview
    load
    if @options[:exclude] && @options[:exclude].length > 0
      puts "The following branches have been excluded"
      @options[:exclude].each do |branch_name|
        puts "  #{branch_name}"
      end
      puts
    end

    if @options[:only] && @options[:only].length > 0
      puts "The following branches will be compared against:"
      @options[:only].each do |branch_name|
        puts "  #{branch_name}"
      end
      puts
    end

    if branches.any_missing_commits?
      puts "The following branches possibly have commits not merged to #{upstream}:"
      branches.each do |branch|
        num_unmerged = yellow(branch.unmerged_commits.size.to_s)
        num_equivalent = green(branch.equivalent_commits.size.to_s)
        puts %|  #{branch.name} (#{num_unmerged}/#{num_equivalent} commits)|
      end
    end
  end

  def print_help
    puts <<-EOT.gsub(/^\s+\|/, '')
      |Usage: #{$0} [-a] [--upstream <branch>] [--remote] [--prune]
      |
      |This script wraps the "git cherry" command. It reports the commits from all local
      |branches which have not been merged into an upstream branch.
      |
      |  #{yellow("yellow")} commits have not been merged
      |  #{green("green")} commits have equivalent changes in <upstream> but different SHAs
      |
      |The default upstream is 'master' (or 'origin/master' if running with --remote)
      |
      |OPTIONS:
      |  -a   display all unmerged commits (verbose)
      |  --remote (-r)  compare remote branches instead of local branches
      |  --upstream <branch>   specify a specific upstream branch (defaults to master)
      |  --exclude <branch>[,<branch>,...]   specify a comma-separated list of branches to exclude
      |  --only <branch>[,<branch>,...]   specify a comma-separated list of branches to include
      |  --prune  prompts user to delete branches which have no differences with the upstream
      |
      |EXAMPLE: check for all unmerged commits
      |  #{$0}
      |
      |EXAMPLE: check for all unmerged commits and merged commits (but with a different SHA)
      |  #{$0} -a
      |
      |EXAMPLE: use a different upstream than master
      |  #{$0} --upstream otherbranch
      |
      |EXAMPLE: compare remote branches against origin/master
      |  #{$0} --remote (-r)
      |
      |EXAMPLE: delete branches without unmerged commits
      |  #{$0} --prune
      |
      |EXAMPLE: delete remote branches without unmerged commits
      |  #{$0} --remote --prune
      |
      |GITCONFIG:
      |  If you name this file git-unmerged and place it somewhere in your PATH
      |  you will be able to type "git unmerged" to use it. If you'd like to name
      |  it something else and still refer to it with "git unmerged" then you'll
      |  need to set up an alias:
      |      git config --global alias.unmerged \\!#{$0}
      |
      |Version: #{VERSION}
      |Author: Zach Dennis <zdennis@mutuallyhuman.com>
    EOT
    exit
  end

  def print_version
    puts "#{VERSION}"
  end

  def branch_description
    local? ? "local" : "remote"
  end

  def print_specifics
    load

    if branches.any_missing_commits?
      print_breakdown
    else
      puts "There are no #{branch_description} branches out of sync with #{upstream}"
    end
  end

  def print_breakdown
    puts "Below is a breakdown for each branch. Here's a legend:"
    puts
    print_legend
    branches.each do |branch|
      puts
      print "#{branch.name}:"
      if branch.unmerged_commits.empty? && !show_equivalent_commits?
        print "(no unmerged commits"
        if prune?
          print ",", red(" this will be pruned")
          @branches_to_prune << branch
        end
        print ")\n"
      else
        puts
      end
      branch.unmerged_commits.each { |commit| puts yellow(commit.to_s) }

      if show_equivalent_commits?
        branch.equivalent_commits.each do |commit|
          puts green(commit.to_s)
        end
      end
    end
  end

  def print_legend
    load
    puts "  " + yellow("yellow") + " commits have not been merged"
    puts "  " + green("green") + " commits have equivalent changes in #{UPSTREAM} but different SHAs" if show_equivalent_commits?
  end

  def prune
    return unless prune?
    if @branches_to_prune.empty?
      puts "", "There are no branches to prune."
    else
      # Protects Heroku repo's
      rejected_master_branches = @branches_to_prune.reject!{|branch| branch.branch_name =~ /master/}
      puts "", "Are you sure you want to prune the following #{@branches_to_prune.size} branches?", ""
      puts red("(Keep in mind this will remove these branches from the remote repository)") if @remote
      @branches_to_prune.each do |branch|
        puts red(" #{branch.name}")
      end
      puts "(omitting branches named master)" if rejected_master_branches
      puts
      print "y or n: "
      if STDIN.gets=~/y/i
        @branches_to_prune.each do |branch|
          if local?
            `git branch -D #{branch.name}`
          elsif remote?
            puts "pruning: #{branch.branch_name} with 'git push #{branch.repository} :#{branch.branch_name}'"
            `git push #{branch.repository} :#{branch.branch_name}`
          end
        end
        puts "", "Pruned #{@branches_to_prune.size} branches."
      else
        puts "", "Pruning aborted. All branches were left unharmed."
      end
    end
  end

  def prune? ; @options[:prune ] ; end
  def show_help? ; @options[:show_help] ; end
  def show_equivalent_commits? ; @options[:show_equivalent_commits] ; end
  def show_version? ; @options[:show_version] ; end

  def upstream
    if @options[:upstream]
      @options[:upstream]
    elsif local?
      "master"
    elsif remote?
      "origin/master"
    end
  end

  private

  def extract_options_from_args(args)
    if args.include?("--remote") || args.include?("-r")
      @options[:remote] = true
    else
      @options[:local] = true
    end

    @options[:prune] = true if args.include?("--prune")
    @options[:show_help] = true if args.include?("-h") || args.include?("--help")
    @options[:show_equivalent_commits] = true if args.include?("-a")
    @options[:show_version] = true if args.include?("-v") || args.include?("--version")

    if index=args.index("--upstream")
      @options[:upstream] = args[index+1]
    end

    if index=args.index("--exclude")
      @options[:exclude] = args[index+1].split(',')
    end

    if index=args.index("--only")
      @options[:only] = args[index+1].split(',')
    end
  end

  def local? ; @options[:local] ; end
  def remote? ; @options[:remote] ; end
end


unmerged = GitUnmerged.new ARGV
UPSTREAM = unmerged.upstream
if unmerged.show_help?
  unmerged.print_help
  exit
elsif unmerged.show_version?
  unmerged.print_version
  exit
else
  unmerged.print_overview
  puts
  unmerged.print_specifics
  unmerged.prune
end

Git committer activity

Mon, 21 Mar 2016 12:57:35 -0500

Git command git shortlog is very handy to see what is team activity.

Show committer activity - whole project
#

(output shortened to first 20 lines)

git shortlog -sn | head -20
  2991	Paul King
  1757	Cedric Champeau
  1615	Jochen Theodorou
  1031	James Strachan
   749	Guillaume Laforge
   312	Roshan Dawrani
   306	Jason Dillon
   301	Danno Ferrin
   284	Alex Tkachman
   273	PascalSchumacher
   230	John Wilson
   217	Pascal Schumacher
   204	pascalschumacher
   160	Thibault Kruse
   158	Jeremy Rayner
   134	Russel Winder
   123	Cédric Champeau
   122	Hamlet D'Arcy
   116	Dierk Koenig
   104	Pilho Kim

variant (without n) has different ordering:

Git project statistic tool

Sun, 20 Mar 2016 12:57:35 -0500

Git project statistic tool
#

Python based, requires Python 2.6+

Works OOTB on Mac

Installation
#

Download TAR from Github
unzipped to /opt

➜  ll /opt/gitinspector-0.3.2
total 52K
-rw-r--r--  1 miro  999 Jul 29  2013 DESCRIPTION.txt
-rw-r--r--  1 miro  32K Jun 14  2013 LICENSE.txt
-rw-r--r--  1 miro   78 Jul  2  2013 MANIFEST.in
-rw-r--r--  1 miro  681 Jan 13  2014 README.txt
drwxr-xr-x 45 miro 1.5K Mar 20  2015 gitinspector
-rw-r--r--  1 miro 1.9K Jan 14  2014 setup.py
-rw-r--r--  1 miro  110 Jul 27  2013 stdeb.cfg

create symlink from ~/bin (or from whatever directory on $PATH)

ln -s /opt/gitinspector-0.3.2/gitinspector/gitinspector.py ~/bin/gitinspector.py
  
➜  ~  ll ~/bin | grep gitin
lrwxr-xr-x 1 miro   52 Mar 20 16:06 gitinspector.py -> /opt/gitinspector-0.3.2/gitinspector/gitinspector.py

Example
#

Look at scala sources - git@github.com:scala/scala.git

Accessing internal AWS servers directly from Mac

Thu, 18 Feb 2016 00:57:35 -0500

Motivation for this hack is my unwillingness to suffer the pain of using Windows UI just to access BCC, ACC or other ATG tools requiring non command-line interface.

The credit for finding out about approach is blog post by James McOrmond - VPN over SSH - who is using this neat trick from Linux for quite some time.

The software mentioned https://github.com/apenwarr/sshuttle supposedly works on OS-X, however, it has not been updated for 4-5 years and would not function for me (OS-X Yosemite).

How to truncate Git history

Tue, 14 Jul 2015 11:22:48 +0800

The general idea
#

#!/bin/bash
# Parameter: tag or sha1
git checkout --orphan temp $1
git commit -m "Truncated history"
git rebase --onto temp $1 master
git branch -D temp

Requires Git 1.8+

Works well for mostly linear history (aka Git used for diff-ing of the catalog feeds).

How it works
#

Starting repo (training):

Setting up a local web server on a Mac

Tue, 07 Jul 2015 21:44:00 +0800

See

Meta-List

https://discussions.apple.com/docs/DOC-3083

How to fix Jenkins build issues related to Git connectivity

Thu, 18 Jun 2015 11:22:48 +0800

Symptoms:
#

build fails
cannot checkout / connect to GIT

Validate this is the case
#

ssh to jenkins2
assume identity of jenkins user (VERY IMPORTANT)
go to /home/projects/workspace/PROJECTNAME directory

This directory is repository clone. Try ‘git status’ in that directory. If you see something like

Git project statistic tool

Fri, 20 Mar 2015 11:22:48 +0800

Git Inspector
#

Python based, requires Python 2.6+

Works OOTB on Mac

Installation
#

Download TAR from https://code.google.com/p/gitinspector/
unzipped to

/opt/gitinspector-0.3.2:
total 52K
-rw-r--r--  1 miro  999 Jul 29  2013 DESCRIPTION.txt
-rw-r--r--  1 miro  32K Jun 14  2013 LICENSE.txt
-rw-r--r--  1 miro   78 Jul  2  2013 MANIFEST.in
-rw-r--r--  1 miro  681 Jan 13  2014 README.txt
drwxr-xr-x 45 miro 1.5K Mar 20 16:06 gitinspector
-rw-r--r--  1 miro 1.9K Jan 14  2014 setup.py
-rw-r--r--  1 miro  110 Jul 27  2013 stdeb.cfg

create symlink to it from ~/bin (is on path)

ln -s /opt/gitinspector-0.3.2/gitinspector/gitinspector.py ~/bin/gitinspector.py
  
➜  ~  ll ~/bin | grep gitin
lrwxr-xr-x 1 miro   52 Mar 20 16:06 gitinspector.py -> /opt/gitinspector-0.3.2/gitinspector/gitinspector.py

Example
#

➜  gitinspector git:(master) ~/bin/gitinspector.py -Tlr --since=2014-01-01 --until=2015-05-05
Statistical information for the repository 'gitinspector' was gathered on 2019/11/27.
The following historical commit information, by author, was found in the repository:

Author                     Commits    Insertions      Deletions    % of changes
Adam Waldenberg                 41           569            249           95.34
Chris Barry                      1             3              3            0.70
Christian Kastner                2             9              5            1.63
Diomidis Spinellis               2             3              3            0.70
Dmitry Dzhus                     1             3              3            0.70
Jon Warghed                      1             1              0            0.12
Yannick Moy                      1             4              3            0.82

Below are the number of rows from each author that have survived and are still intact in the current revision:

Author                     Rows      Stability          Age       % in comments
Adam Waldenberg             468           82.2          8.7                6.84
Chris Barry                   3          100.0          4.5                0.00
Christian Kastner             8           88.9          3.3                0.00
Diomidis Spinellis            1           33.3          4.0              100.00
Dmitry Dzhus                  3          100.0          2.6                0.00
Jon Warghed                   1          100.0          3.2                0.00
Yannick Moy                   3           75.0          3.7                0.00

The following history timeline has been gathered from the repository:

Author                  2014-01    2014-02    2014-03    2014-11    2014-12    2015-02
Adam Waldenberg        -+++++++   --++++++   ---+++++  ----+++++  --+++++++   -+++++++
Chris Barry                                                    .
Christian Kastner                                              .
Diomidis Spinellis                                             .
Dmitry Dzhus                                                              .
Jon Warghed                                                    .
Yannick Moy                                                    .
Modified Rows:              170        387          7        223         64          7

The following responsibilities, by author, were found in the current revision of the repository (comments are excluded from the line count, if possible):

Adam Waldenberg is mostly responsible for:
   128 gitinspector/metrics.py
    97 gitinspector/blame.py
    30 gitinspector/localization.py
    29 gitinspector/clone.py
    26 gitinspector/terminal.py
    26 gitinspector/basedir.py
    19 gitinspector/changes.py
    17 gitinspector/filtering.py
    16 gitinspector/format.py
    15 gitinspector/gitinspector.py

Chris Barry is mostly responsible for:
     2 gitinspector/format.py
     1 gitinspector/gravatar.py

Christian Kastner is mostly responsible for:
     5 gitinspector/basedir.py
     3 gitinspector/format.py

Dmitry Dzhus is mostly responsible for:
     3 gitinspector/comment.py

Jon Warghed is mostly responsible for:
     1 gitinspector/changes.py

Yannick Moy is mostly responsible for:
     3 gitinspector/comment.py

The extensions below were found in the repository history (extensions used during statistical analysis are marked):
1 css header html po pot [py] txt

How to keep git log and less output on the screen

Tue, 10 Mar 2015 00:57:35 -0500

When git uses less as pager the output of commands like git log disappears from the console screen when you exit from less. This is not convenient in many cases so here is how to fix this.

Just for git commands:

git config --global --replace-all core.pager "less -iXFR"

For less globally (including git) - add to .bashrc / .zshrc / etc:

export LESS=-iXFR

The options we set for less are:

Finding unmerged commits in all branches

Thu, 05 Feb 2015 11:22:48 +0800

This one goes beyond git, but is very useful. Ruby script that produces this:

Here is the script


#!/usr/bin/env ruby
require 'rubygems'
gem 'term-ansicolor', '=1.3.0'
require 'term/ansicolor'
class GitCommit
  attr_reader :content
   
  def initialize(content)
    @content = content
  end
   
  def sha
    @content.split[1]
  end
  def to_s
    `git log --pretty=format:"%h %ad %an - %s" #{sha}~1..#{sha}`
  end
   
  def unmerged?
    content =~ /^\+/
  end
   
  def equivalent?
    content =~ /^\-/
  end
end
class GitBranch
  attr_reader :name, :commits
   
  def initialize(name, commits)
    @name = name
    @commits = commits
  end
   
  def unmerged_commits
    commits.select{ |commit| commit.unmerged? }
  end
  def equivalent_commits
    commits.select{ |commit| commit.equivalent? }
  end
end
class GitBranches < Array
  def self.clean_branch_output(str)
    str.split(/\n/).map{ |e| e.strip.gsub(/\*\s+/, '') }.reject{ |branch| branch =~ /\b#{Regexp.escape(UPSTREAM)}\b/ }.sort
  end
   
  def self.local_branches
    clean_branch_output `git branch`
  end
   
  def self.remote_branches
    clean_branch_output `git branch -r`
  end
   
  def self.load(options)
    git_branches = new
    branches = if options[:local]
      local_branches
    elsif options[:remote]
      remote_branches
    end
     
    branches.each do |branch|
      raw_commits = `git cherry -v #{UPSTREAM} #{branch}`.split(/\n/).map{ |c| GitCommit.new(c) }
      git_branches << GitBranch.new(branch, raw_commits)
    end
    git_branches
  end
   
  def unmerged
    reject{ |branch| branch.commits.empty? }.sort_by{ |branch| branch.name }
  end
   
  def any_missing_commits?
    select{ |branch| branch.commits.any? }.any?
  end
end
class GitUnmerged
  VERSION = "1.0.1"
   
  include Term::ANSIColor
   
  attr_reader :branches
  def initialize(args)
    @options = {}
    extract_options_from_args(args)
  end
   
  def load
    @branches ||= GitBranches.load(:local => local?, :remote => remote?)
  end
   
  def print_overview
    load
    if branches.any_missing_commits?
      puts "The following branches possibly have commits not merged to #{upstream}:"
      branches.each do |branch|
        num_unmerged = yellow(branch.unmerged_commits.size.to_s)
        num_equivalent = green(branch.equivalent_commits.size.to_s)
        puts %|  #{branch.name} (#{num_unmerged}/#{num_equivalent} commits)|
      end
    end
  end
   
  def print_help
    puts <<-EOT.gsub(/^\s+\|/, '')
      |Usage: #{$0} [-a] [--upstream <branch>] [--remote]
      |
      |This script wraps the "git cherry" command. It reports the commits from all local
      |branches which have not been merged into an upstream branch.
      |
      |  #{yellow("yellow")} commits have not been merged
      |  #{green("green")} commits have equivalent changes in <upstream> but different SHAs
      |
      |The default upstream is 'master'.
      |
      |OPTIONS:
      |  -a   display all unmerged commits (verbose)
      |  --remote   compare remote branches instead of local branches
      |  --upstream <branch>   specify a specific upstream branch
      |
      |EXAMPLE: check for all unmerged commits
      |  #{$0}
      |
      |EXAMPLE: check for all unmerged commits and merged commits (but with a different SHA)
      |  #{$0} -a
      |
      |EXAMPLE: use a different upstream than master
      |  #{$0} --upstream otherbranch
      |
      |EXAMPLE: compare remote branches against origin/master
      |  #{$0} --remote
      |
      |GITCONFIG:
      |  If you name this file git-unmerged and place it somewhere in your PATH
      |  you will be able to type "git unmerged" to use it. If you'd like to name
      |  it something else and still refer to it with "git unmerged" then you'll
      |  need to set up an alias:
      |      git config --global alias.unmerged \\!#{$0}
      |
      |Version: #{VERSION}
      |Author: Zach Dennis <zdennis@mutuallyhuman.com>
    EOT
    exit
  end
   
  def print_version
    puts "#{VERSION}"
  end
     
  def branch_description
    local? ? "local" : "remote"
  end
   
  def print_specifics
    load
    if branches.any_missing_commits?
      print_breakdown
    else
      puts "There are no #{branch_description} branches out of sync with #{upstream}"
    end
  end
   
  def print_breakdown
    puts "Below is a breakdown for each branch. Here's a legend:"
    puts
    print_legend
    branches.each do |branch|
      puts
      print "#{branch.name}:"
      if branch.unmerged_commits.empty? && !show_equivalent_commits?
        print "(no umerged commits, must have merged commits with different SHAs)\n"
      else
        puts
      end
      branch.unmerged_commits.each { |commit| puts yellow(commit.to_s) }
      if show_equivalent_commits?
        branch.equivalent_commits.each do |commit|
          puts green(commit.to_s)
        end
      end
    end
  end
   
  def print_legend
    load
    puts "  " + yellow("yellow") + " commits have not been merged"
    puts "  " + green("green") + " commits have equivalent changes in #{UPSTREAM} but different SHAs" if show_equivalent_commits?
  end
   
  def show_help? ; @options[:show_help] ; end
  def show_equivalent_commits? ; @options[:show_equivalent_commits] ; end
  def show_version? ; @options[:show_version] ; end
  def upstream
    if @options[:upstream]
      @options[:upstream]
    elsif local?
      "master"
    elsif remote?
      "origin/master"
    end
  end
   
  private
   
  def extract_options_from_args(args)
    if args.include?("--remote")
      @options[:remote] = true
    else
      @options[:local] = true
    end
    @options[:show_help] = true if args.include?("-h") || args.include?("--help")
    @options[:show_equivalent_commits] = true if args.include?("-a")
    @options[:show_version] = true if args.include?("-v") || args.include?("--version")
    if index=args.index("--upstream")
      @options[:upstream] = args[index+1]
    end
  end
   
  def local? ; @options[:local] ; end
  def remote? ; @options[:remote] ; end
end
 
unmerged = GitUnmerged.new ARGV
UPSTREAM = unmerged.upstream
if unmerged.show_help?
  unmerged.print_help
  exit
elsif unmerged.show_version?
  unmerged.print_version
  exit
else
  unmerged.print_overview
  puts
  unmerged.print_specifics
end

Replace BSD grep with GNU grep

Sun, 02 Nov 2014 11:22:48 +0800

If annoyed with:
#

➜  ~  echo $PATH | tr ':' '\n'
/usr/local/opt/coreutils/libexec/gnubin
/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home/bin
/opt/ant/bin
/opt/groovy/bin
/opt/gradle/bin
/Users/miro/bin
/usr/local/bin
/usr/bin
/bin
/usr/sbin
/sbin
/usr/local/bin
/opt/X11/bin
/usr/texbin
  
# YEs I am using GNU core utils but grep is not there
  
# The issue
➜  ~  grep --version
grep (BSD grep) 2.5.1-FreeBSD

Here is the receipt

Keepass-Node install

Fri, 03 Oct 2014 11:22:48 +0800

See https://github.com/gesellix/keepass-node

➜  keepass-node git:(master) pwd
/Users/miro/src/PLG/keepass-node

Install
#

➜  keepass-node git:(master) ✗ sudo npm install
Password:
> dejavu@0.4.4 postinstall /Users/miro/src/PLG/keepass-node/node_modules/keepass.io/node_modules/dejavu
> node bin/post_install.js
Saving runtime configuration in /Users/miro/src/PLG/keepass-node/node_modules/keepass.io/.dejavurc
> keepass.io@1.0.5 install /Users/miro/src/PLG/keepass-node/node_modules/keepass.io
> (node-gyp rebuild 2>&1) || (echo 'DO NOT WORRY ABOUT THESE MESSAGES. KEEPASS.IO WILL FALLBACK TO SLOWER NODE.JS METHODS, SO THERE ARE NO LIMITATIONS EXCEPT SLOWER PERFORMANCE.'; exit 0)
\
Agreeing to the Xcode/iOS license requires admin privileges, please re-run as root via sudo.
Agreeing to the Xcode/iOS license requires admin privileges, please re-run as root via sudo.
 
gyp ERR! build error
gyp ERR! stack Error: `make` failed with exit code: 69
gyp ERR! stack     at ChildProcess.onExit (/usr/local/lib/node_modules/npm/node_modules/node-gyp/lib/build.js:267:23)
gyp ERR! stack     at ChildProcess.emit (events.js:98:17)
gyp ERR! stack     at Process.ChildProcess._handle.onexit (child_process.js:810:12)
gyp ERR! System Darwin 13.4.0
gyp ERR! command "node" "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "rebuild"
gyp ERR! cwd /Users/miro/src/PLG/keepass-node/node_modules/keepass.io
gyp ERR! node -v v0.10.31
gyp ERR! node-gyp -v v1.0.1
gyp ERR! not ok
DO NOT WORRY ABOUT THESE MESSAGES. KEEPASS.IO WILL FALLBACK TO SLOWER NODE.JS METHODS, SO THERE ARE NO LIMITATIONS EXCEPT SLOWER PERFORMANCE.
chai-as-promised@4.1.1 node_modules/chai-as-promised
underscore@1.7.0 node_modules/underscore
q@1.0.1 node_modules/q
compression@1.1.0 node_modules/compression
├── bytes@1.0.0
├── on-headers@1.0.0
├── vary@1.0.0
├── debug@2.0.0 (ms@0.6.2)
├── compressible@2.0.0 (mime-db@1.0.3)
└── accepts@1.1.1 (negotiator@0.4.8, mime-types@2.0.2)
chai@1.9.2 node_modules/chai
├── assertion-error@1.0.0
└── deep-eql@0.1.3 (type-detect@0.1.1)
express@4.9.5 node_modules/express
├── merge-descriptors@0.0.2
├── utils-merge@1.0.0
├── fresh@0.2.4
├── cookie@0.1.2
├── escape-html@1.0.1
├── range-parser@1.0.2
├── cookie-signature@1.0.5
├── media-typer@0.3.0
├── vary@1.0.0
├── finalhandler@0.2.0
├── parseurl@1.3.0
├── methods@1.1.0
├── serve-static@1.6.3
├── path-to-regexp@0.1.3
├── depd@0.4.5
├── qs@2.2.4
├── debug@2.0.0 (ms@0.6.2)
├── on-finished@2.1.0 (ee-first@1.0.5)
├── etag@1.4.0 (crc@3.0.0)
├── proxy-addr@1.0.3 (forwarded@0.1.0, ipaddr.js@0.1.3)
├── send@0.9.3 (destroy@1.0.3, ms@0.6.2, mime@1.2.11)
├── type-is@1.5.2 (mime-types@2.0.2)
└── accepts@1.1.1 (negotiator@0.4.8, mime-types@2.0.2)
mocha@1.21.4 node_modules/mocha
├── diff@1.0.7
├── growl@1.8.1
├── commander@2.0.0
├── mkdirp@0.3.5
├── debug@2.0.0 (ms@0.6.2)
├── jade@0.26.3 (commander@0.6.1, mkdirp@0.3.0)
└── glob@3.2.3 (inherits@2.0.1, graceful-fs@2.0.3, minimatch@0.2.14)
body-parser@1.9.0 node_modules/body-parser
├── bytes@1.0.0
├── media-typer@0.3.0
├── raw-body@1.3.0
├── depd@1.0.0
├── qs@2.2.4
├── iconv-lite@0.4.4
├── on-finished@2.1.0 (ee-first@1.0.5)
└── type-is@1.5.2 (mime-types@2.0.2)
coveralls@2.11.2 node_modules/coveralls
├── lcov-parse@0.0.6
├── log-driver@1.2.4
├── request@2.40.0 (json-stringify-safe@5.0.0, forever-agent@0.5.2, aws-sign2@0.5.0, oauth-sign@0.3.0, stringstream@0.0.4, tunnel-agent@0.4.0, qs@1.0.2, node-uuid@1.4.1, mime-types@1.0.2, tough-cookie@0.12.1, form-data@0.1.4, http-signature@0.10.0, hawk@1.1.1)
└── js-yaml@3.0.1 (esprima@1.0.4, argparse@0.1.15)
istanbul@0.3.2 node_modules/istanbul
├── abbrev@1.0.5
├── which@1.0.5
├── nopt@3.0.1
├── wordwrap@0.0.2
├── once@1.3.1 (wrappy@1.0.1)
├── async@0.9.0
├── resolve@0.7.4
├── mkdirp@0.5.0 (minimist@0.0.8)
├── fileset@0.1.5 (minimatch@0.4.0, glob@3.2.11)
├── esprima@1.2.2
├── escodegen@1.3.3 (estraverse@1.5.1, esutils@1.0.0, source-map@0.1.40, esprima@1.1.1)
├── handlebars@1.3.0 (optimist@0.3.7, uglify-js@2.3.6)
└── js-yaml@3.2.2 (esprima@1.0.4, argparse@0.1.15)
googleapis@1.0.14 node_modules/googleapis
├── async@0.9.0
├── multipart-stream@1.0.0 (inherits@2.0.1, sandwich-stream@0.0.4)
├── request@2.40.0 (json-stringify-safe@5.0.0, aws-sign2@0.5.0, forever-agent@0.5.2, oauth-sign@0.3.0, stringstream@0.0.4, tunnel-agent@0.4.0, qs@1.0.2, node-uuid@1.4.1, mime-types@1.0.2, form-data@0.1.4, tough-cookie@0.12.1, http-signature@0.10.0, hawk@1.1.1)
└── gapitoken@0.1.3 (jws@0.0.2)
keepass.io@1.0.5 node_modules/keepass.io
├── async@0.9.0
├── nan@1.2.0
├── xml2js@0.4.4 (sax@0.6.0, xmlbuilder@2.4.4)
└── dejavu@0.4.4 (amdefine@0.0.8, mout@0.4.0)
➜  keepass-node git:(master)

Kinda weird to ignore errors, but anyway …

Gitbits - Get committer lists

Mon, 29 Sep 2014 11:22:48 +0800

With emails (Unix only)
#

➜  dev1 git:(miro-ui) ✗ git log --raw | grep "^Author: " | sort | uniq -c
 
      9 Author: Brendan Smith <Brendan.Smith@thinkwrap.com>
     22 Author: Kai Cheng <kai.cheng@thinkwrap.com>
     97 Author: Miro Adamy <miro.adamy@thinkwrap.com>
     49 Author: Training VM <training-vm@thinkwrap.com>
     24 Author: Your Name <your.name@thinkwrap.com>

Pure git
#

➜  dev1 git:(miro-ui) ✗ git shortlog -sen
  
    97  Miro Adamy <miro.adamy@thinkwrap.com>
    49  Training VM <training-vm@thinkwrap.com>
    24  Your Name <your.name@thinkwrap.com>
    22  Kai Cheng <kai.cheng@thinkwrap.com>
     9  Brendan Smith <Brendan.Smith@thinkwrap.com>

Mailmap option to consolidate the variety of authors
#

Before (no mailmap)
#

...
 609  milos hanzel <milos.hanzel@thinkwrap.com>
 361  brant maahs <brant.maahs@thinkwrap.com>
  69  Sullivan Tseng <sullivantseng@gmail.com>
  42  sullivan tseng <sullivan.tseng@thinkwrap.com>
  17  milos.hanzel <milos.hanzel@thinkwrap.com>
   2  Miro Adamy <miro.adamy@thinkwrap.com>
...

Generating the mailman start

Git bit of the day

Mon, 22 Sep 2014 11:22:48 +0800

Question from email:
#

how do I merge 1 file from master -> LIVE

Answer
#

You cannot. Merge operation creates new commit that has 2 or more parents and will always join full histories of the branches.

You can however:

replicate all changes done in single commit to different branch - this is “cherry pick”
take state of single file from different branch into current branch

How to replicate all changes done in single commit to different branch - “cherry pick”
#

Say you have latest commit in master that contains change to two files you need.

Few gitbits

Wed, 03 Sep 2014 11:22:48 +0800

Show branches and tags in log
#

git log –oneline –decorate

Even better - all branches with graph
#

git log –oneline –decorate –all –graph

Highlight words instead of lines
#

git diff –word-diff HEAD~~~ HEAD~~

Gitolite permissions setup

Wed, 02 Apr 2014 11:22:48 +0800

This documents how to enforce the Gitolite permission to make LIVE branch writeable only by team leads

How gitolite works
#

Repository permission structure
#

This is general format of repo definition

REPO NAME
   rule line
   rule line

for example

@staff          =   dilbert alice wally bob
 
repo foo
    RW+         =   dilbert     # line 1
    RW+ dev     =   alice       # line 2
    -           =   wally       # line 3
    RW  temp/   =   @staff      # line 4
    R           =   ashok       # line 5

The Rule line has format:

Difference between matching and simple Git push

Tue, 31 Dec 2013 16:41:38 -0500

I started to see this message in some of my Git environments

Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:
 
git config --global push.default matching
 
 
To squelch this message and adopt the new behavior now, use:
 
 
git config --global push.default simple

This is collection of information gathered from Stackoverflow, Git docs and various internet sources. Putting it together so that I do not have to google it again.

Merge conflict with deleted file

Sat, 13 Apr 2013 11:22:48 +0800

I was merging the branch that removed / consolidated bunch of duplicate JSP files (corporate-ui-cleanup).

In the meantime in master, some minor UI changes were made to these files whose content was now elsewhere.

Quick trick how to resolve it fast:

Show branch
#

CineplexB2B $ git show-branch
! [bb-database-cleanup] Loading data with XML only: no constraints and tax_id (unused field) nullable
 ! [bb-gradle-build] Merge branch 'master' into bb-gradle-build
  * [bb-master] Merged in the last 5 days changes
   ! [corporate-ui-cleanup] Merged in the last 5 days changes
    ! [master] Merged in the last 5 days changes
-----
 -    [bb-gradle-build] Merge branch 'master' into bb-gradle-build
 ---- [bb-master] Merged in the last 5 days changes
 +*++ [bb-master^2] CPLXB2B-562, usageInfo/internalUsageInfo mapping in CFI
 +*++ [bb-master^2^] return order goes all the way to NEW: replaced SetPaymentGroupAmount, added ReturnFee calculator, added reusable jsp fragments for sales order pages
 +*++ [bb-master^2~2] Styling change to avoid disappearing links inside Terms and Conditions
 +*++ [bb-master^2~3] Dealing with consequences if INTERNAL split to INTERNAL_TRANSFER and INTERNAL_PURCHASE
 ---- [bb-master^2~4] Merge remote-tracking branch 'origin/master' into uat2-deploy
 ---- [bb-master^2~4^2] Merge branch 'master' of luke:cineplex-b2b
 +*++ [bb-master^2~4^2^] merged changes - fixed conflict
 +*++ [bb-master^2~4^2~2] CPLXBTOB-557 - fixed amount column to show proper currency
 ---- [bb-master^2~4^2~3] Merge branch 'master' of twgit@luke:cineplex-b2b.git
 +*++ [bb-master^2~4^2~4] CPLXBTOB-484 - fixed the spacing and comma issues
 +*++ [bb-master^2~5] Reverted 4d512ed - issue with recalculate. Must be solved selectively via Javascript
 +*++ [bb-master^2~6] Spacing in header

Dot-vimming new machine

Sun, 03 Mar 2013 11:22:48 +0800

New MacMini
#

MacMini:~ mediaserver$ mkdir .vim
MacMini:~ mediaserver$ git clone git@github.com:radegast/dotvim.git .vim
Cloning into '.vim'...
The authenticity of host 'github.com (207.97.227.239)' can't be established.
RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
remote: Counting objects: 367, done.
remote: Compressing objects: 100% (309/309), done.
remote: Total 367 (delta 58), reused 335 (delta 26)
Receiving objects: 100% (367/367), 512.73 KiB, done.
Resolving deltas: 100% (58/58), done.
 
 
MacMini:~ mediaserver$ cd .vim
MacMini:.vim mediaserver$ pwd
/Users/mediaserver/.vim
 
 
MacMini:.vim mediaserver$ ln -s ~/.vim/_vimrc ~/.vim
.vim/     .viminfo 
 
 
MacMini:.vim mediaserver$ ln -s ~/.vim/_vimrc ~/.vimrc
MacMini:.vim mediaserver$ ln -s ~/.vim/_gvimrc ~/.gvimrc
 
 
MacMini:.vim mediaserver$ pwd
/Users/mediaserver/.vim
MacMini:.vim mediaserver$ git submodule init
Submodule 'bundle/tlib_vim' (git://github.com/tomtom/tlib_vim.git) registered for path 'bundle/tlib_vim'
Submodule 'bundle/vim-fugitive' (git://github.com/tpope/vim-fugitive.git) registered for path 'bundle/vim-fugitive'
Submodule 'bundle/vim-pathogen' (git://github.com/tpope/vim-pathogen.git) registered for path 'bundle/vim-pathogen'
Submodule 'bundle/vim-unimpaired' (git://github.com/tpope/vim-unimpaired.git) registered for path 'bundle/vim-unimpaired'
MacMini:.vim mediaserver$ git submodule update
Cloning into 'bundle/tlib_vim'...
remote: Counting objects: 992, done.
remote: Compressing objects: 100% (372/372), done.
remote: Total 992 (delta 594), reused 946 (delta 549)
Receiving objects: 100% (992/992), 210.90 KiB, done.
Resolving deltas: 100% (594/594), done.
Submodule path 'bundle/tlib_vim': checked out 'd66948917ce7153e4a961aa5d57e1b0918e20495'
Cloning into 'bundle/vim-fugitive'...
remote: Counting objects: 1481, done.
remote: Compressing objects: 100% (525/525), done.
remote: Total 1481 (delta 637), reused 1405 (delta 579)
Receiving objects: 100% (1481/1481), 190.02 KiB, done.
Resolving deltas: 100% (637/637), done.
Submodule path 'bundle/vim-fugitive': checked out '1b7e4070f5f7b7522422f5b00a75b323cc314daf'
Cloning into 'bundle/vim-pathogen'...
remote: Counting objects: 395, done.
remote: Compressing objects: 100% (215/215), done.
remote: Total 395 (delta 108), reused 372 (delta 90)
Receiving objects: 100% (395/395), 47.73 KiB, done.
Resolving deltas: 100% (108/108), done.
Submodule path 'bundle/vim-pathogen': checked out 'ab64b4ddd0c184a528780b498a0b0a5b40248f7c'
Cloning into 'bundle/vim-unimpaired'...
remote: Counting objects: 260, done.
remote: Compressing objects: 100% (118/118), done.
remote: Total 260 (delta 84), reused 250 (delta 76)
Receiving objects: 100% (260/260), 33.89 KiB, done.
Resolving deltas: 100% (84/84), done.
Submodule path 'bundle/vim-unimpaired': checked out '440629adb4051e5f9920704570d1ff0e88356dc2'

Adding terminal shortcut ‘mvim’
#

It is packed in the tbz file. Move it to /usr/bin

Custom build of MacVim with file drawer - pure bliss

Sun, 07 Oct 2012 11:22:48 +0800

OK, NERDTree plugin IS great, but this is awesome.

Alloy made custom version of MacVim with file drawer: see https://github.com/alloy/macvim/wiki/Building

It is available in source - so you have to compile it yourselves. But if you do not want to, I did it and the binary is attached, built with these features:

./configure –with-feature=huge –enable-rubyinterp –enable-pythoninterp –enable-perlinterp –enable-cscope

Archive is attached: MacVim.zip

If you want to get my set of plugins and customizations, it is on GitHub: - https://github.com/radegast/dotvim,

Fixing Git plugin for Sublime Text 2

Fri, 21 Sep 2012 11:22:48 +0800

After update, the ST2 started to complain about missing git command.

Finding out Git on MBP:

platform $ which git
git is /usr/bin/git
git is /usr/local/bin/git
 
 
platform $ git --version
git version 1.7.7.5 (Apple Git-26)
  
platform $ /usr/bin/git --version
git version 1.7.7.5 (Apple Git-26)
 
 
platform $ /usr/local/bin/git --version
git version 1.7.3.2

Fix the the Package file in /Users/miro/Library/Application Support/Sublime Text 2/Packages/Git - Git.sublime-settings (it is JSON file)

Gitolite Administration Guide

Mon, 06 Aug 2012 11:22:48 +0800

How to setup new client
#

You need to be pensieve admin to do this. You will have to login as service user (non-host account) and su to root.

create new Linux user on pensieve
setup gitolite:
- git clone <git://github.com/sitaramc/gitolite>
- mkdir bin; export PATH=$PATH:~/bin
- gitolite/install -ln
add own public key to gitolite to get access to gilotile-admin repo (note the naming restrictions!!)
- gitolite setup -pk miro.pub
get public key for the client account admin and add it (there can be multiple admins)
clone the gitolite-admin repo from workstation whose pub key was added
- git clone <client@pensieve.thinkwrap>.[com:gitolite-admin.git](http://comgitolite-admin.git/)
- add the key to the repo
  - cd gitolite-admin
  - cp ~/mykey.pub keydir
  - vim conf/gitolite conf
  - add the newly added account admit to repos, create new repos if required

All gitolite installs are independent so modification in one hosting user have zero impact on others.

Using Gitolite for code sharing setup

Thu, 21 Jun 2012 11:22:48 +0800

General setup of code sharing host
#

The code sharing host (Pensieve) is dedicated Linux server in DMZ, accessible from external locations as well as from internal network (dual homed) - for the build server access.

Main features
#

multiple users
each user represent a client:
- e.g. users client1

Users are separated by Unix permissions:
#

access rights to /home/USER are 0700 - no access except the dedicated user
only ThinkWrap has root access or sudo access
the access via ssh for the user is blocked - the user client1 cannot log in using ssh and get shell, only use git to pull or push changes

Inside each user, there are multiple projects.
#

These projects will have multiple repositiories and will follow the naming convention:

GitHub identity mixup

Sun, 15 Apr 2012 11:22:48 +0800

After I created the ThinkWrap GitHub account and uploaded the public key, this key got somehow bound to GitHub identity ‘madamy’

I had to add user madamy to my public GitHub repo - where I keep the dot-files - https://github.com/radegast/dotvim

This may be an issue for people that have their own private accounts - the key management is the key.

This article is useful:

Alternative
#

Use https for forking , instead read/write ssh. No keys involved there

Using MacVim as git editor

Mon, 09 Apr 2012 11:22:48 +0800

Add this to .bashrc
#

export GIT_EDITOR=’/Applications/MacVim.app/Contents/MacOS/Vim -g -f '

The key is -f, without it git will abort because of empty commit message.

Few gitbits to remember

Sun, 25 Mar 2012 15:43:48 +0800

Few gitbits to remember
#

Pushing new local branch to remote repo:
#

Find a ref that matches experimental in the source repository (most likely, it would findrefs/heads/experimental), and update the same ref (e.g. refs/heads/experimental) in origin repository with it.

If experimental did not exist remotely, it would be created.

How to fix the remote origin from read only

Wed, 21 Mar 2012 11:22:48 +0800

Issue
#

In dotvim repo, I used readonly URL for cloning the repository. Now I have created local branch ( linux-vm ) to track Linux specific font settings and need them to push up.

After creating new SSH pair and adding to GitHub, does not work

[tkuser@cplx-dev-vf .vim]$ git status
# On branch linux-vm
nothing to commit (working directory clean)[tkuser@cplx-dev-vf .vim]$ git push origin linux-vm
fatal: remote error:
 You can't push to git://github.com/radegast/dotvim.git
 Use git@github.com:radegast/dotvim.git
 
[tkuser@cplx-dev-vf .vim]$ git remote show origin
* remote origin
 Fetch URL: git://github.com/radegast/dotvim.git
 Push URL: git://github.com/radegast/dotvim.git
 HEAD branch: master
 Remote branch:
 master tracked
 Local branch configured for 'git pull':
 master merges with remote master
 Local ref configured for 'git push':
 master pushes to master (up to date)
 
[tkuser@cplx-dev-vf .vim]$ git remote set-url --push origin git@github.com:radegast/dotvim.git
 
[tkuser@cplx-dev-vf .vim]$ git remote show origin
* remote origin
 Fetch URL: git://github.com/radegast/dotvim.git
 Push URL: git@github.com:radegast/dotvim.git
 HEAD branch: master
 Remote branch:
 master tracked
 Local branch configured for 'git pull':
 master merges with remote master
 Local ref configured for 'git push':
 master pushes to master (up to date)
 
[tkuser@cplx-dev-vf .vim]$ git push origin linux-vm
Enter passphrase for key '/home/tkuser/.ssh/id_rsa':
Counting objects: 5, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 306 bytes, done.
Total 3 (delta 1), reused 0 (delta 0)
To git@github.com:radegast/dotvim.git
 * [new branch] linux-vm -> linux-vm

The important line is

Excellent free Git tutorial

Fri, 02 Jan 2009 11:29:21 -0500

Two screencasts, about 80 and 40 minutes long are available at:

http://excess.org/article/2008/07/ogre-git-tutorial/

Courtesy by fellow Ottawan Bert Trojanowski. Really nice job of providing deep enough technical understanding with good illustrative examples.

If you want to get into distributed version control (which is IMHO way to go), check this out.

Three great Git resources

Sat, 20 Sep 2008 22:10:41 -0400

Before I forget :-)

1) The Git Magic

2) Two git books Pragmatic Git Book and Git internals - nice complement each other

3) Linus Torvalds slightly offensive and very funny talk at Google

in addition to great, precise but not necessarily most digestable manual ...

Git on Miro's World

How to monitor Bitbucket user and group permissions with API

How to manage users and groups in Bitbucket #

How to mirror Github and Bitbucket repositories

Mirroring large number of GitHub or Bitbucket repositories #

Assumptions #

Steps #

How to list Github repositories and users

How to list repositories in GitHub #

Setup #

How to list Bitbucket repositories and users

How to list repositories in Bitbucket #

Setup #

Using SSH keys with multiple Bitbucket accounts

Building Hugo as well on GitLab pages

Parallel building challenges #

Using same repo #

Gitbits

git-attic #

Example #

git trail #

Storing sensitive information in Git

The issue #

Managing code in remote SVN repo

Options #

Use git-svn bridge #

Process for transferring Git repo from Gitolite to Bitbucket

Task #

User setup #

Update all local branches in Git repo

Update all local branches in Git repo #

git ffwd-update command #

Learning resources for Linux and Command line

Free resources #

Hands On #

Git bits 2

Show merged and unmerged branches #

Git - find unmerged commits

Example #

The code #

Git committer activity

Show committer activity - whole project #

Git project statistic tool

Git project statistic tool #

Installation #

Example #

Accessing internal AWS servers directly from Mac

How to truncate Git history

The general idea #

How it works #

Setting up a local web server on a Mac

How to fix Jenkins build issues related to Git connectivity

Symptoms: #

Validate this is the case #

Git project statistic tool

Git Inspector #

Installation #

Example #

How to keep git log and less output on the screen

Finding unmerged commits in all branches

Replace BSD grep with GNU grep

If annoyed with: #

Keepass-Node install

Install #

Gitbits - Get committer lists

With emails (Unix only) #

Pure git #

Mailmap option to consolidate the variety of authors #

Before (no mailmap) #

Git bit of the day

Question from email: #

Answer #

How to replicate all changes done in single commit to different branch - “cherry pick” #

Few gitbits

Show branches and tags in log #

Even better - all branches with graph #

Highlight words instead of lines #

Gitolite permissions setup

How gitolite works #

Repository permission structure #

How to manage users and groups in Bitbucket
#

Mirroring large number of GitHub or Bitbucket repositories
#

Assumptions
#

Steps
#

How to list repositories in GitHub
#

Setup
#

How to list repositories in Bitbucket
#

Setup
#

Parallel building challenges
#

Using same repo
#

git-attic
#

Example
#

git trail
#

The issue
#

Options
#

Use git-svn bridge
#

Task
#

User setup
#

Update all local branches in Git repo
#

git ffwd-update command
#

Free resources
#

Hands On
#

Show merged and unmerged branches
#

Example
#

The code
#

Show committer activity - whole project
#

Git project statistic tool
#

Installation
#

Example
#

The general idea
#

How it works
#

Symptoms:
#

Validate this is the case
#

Git Inspector
#

Installation
#

Example
#

If annoyed with:
#

Install
#

With emails (Unix only)
#

Pure git
#

Mailmap option to consolidate the variety of authors
#

Before (no mailmap)
#

Question from email:
#

Answer
#

How to replicate all changes done in single commit to different branch - “cherry pick”
#

Show branches and tags in log
#

Even better - all branches with graph
#

Highlight words instead of lines
#

How gitolite works
#

Repository permission structure
#

Show branch
#

New MacMini
#

Adding terminal shortcut ‘mvim’
#

How to setup new client
#

General setup of code sharing host
#

Main features
#

Users are separated by Unix permissions:
#

Inside each user, there are multiple projects.
#

Alternative
#

Add this to .bashrc
#

Few gitbits to remember
#

Pushing new local branch to remote repo:
#

Issue
#