phpfunk · May 2, 2017 18:42
diff --git a/alias.sh b/alias.sh
 ### Alias
 alias gam='php /path/to/auto-merge.php'
diff --git a/auto-merge.php b/auto-merge.php
 #!/usr/bin/php
 <?php

 // Normalize data in all branches
 $all_branches = explode(PHP_EOL, shell_exec('git branch'));
 foreach ($all_branches as $k => $branch) {
    $all_branches[$k] = trim(str_replace('*', '', $branch));
 }

 // Look for user submitted variables
 // 1 = comma delimited list of branches to merge into (default is all branches other than production or master)
 // 2 = branch to use to merge from (default will be master or production)
 $local   = (isset($argv[1]) && ! empty($argv[1])) ? explode(',', $argv[1]) : $all_branches;
 $master  = (isset($argv[2]) && ! empty($argv[2])) ? trim($argv[2]) : 'master';

 // Set some other vars
 $branches = array();
 $conflict = false;
 $remotes  = explode(PHP_EOL, shell_exec('git remote'));
 $remote   = (isset($remotes[0]) && ! empty($remotes[0])) ? trim($remotes[0]) : null;
 $remote   = (empty($remote)) ? 'origin' : $remote;

 // Loop thru branches to make final list to merge into
 // Also find the master branch if not already submitted by the user
 foreach ($local as $branch) {
    if (($branch == 'production' || $branch == 'master') && (! isset($argv[2]) || empty($argv[2]))) {
        $master = $branch;
    }
    elseif (! empty($branch)) {
        array_push($branches, $branch);
    }
 }

 // Figure if master branch used for merging even exists
 if (! in_array($master, $all_branches)) {
    print 'Fatal: The branch `' . $master . '` to be used for merging from does not exist.' . PHP_EOL;
    exit(0);
 }

 // Check to make sure there is more than master branch
 $self_merge = (count($branches) == 1 && $branches[0] == $master) ? true : false;

 // If there are branches to merge into, make it happen
 if (! empty($branches) && $self_merge === false) {
    print 'Starting to auto-merge of `' . $master . '` into all other local branches...' . PHP_EOL;
    foreach ($branches as $branch) {
        // check to see if the branch we are checking out even exists
        // If not, skip it

        if (! in_array($branch, $all_branches)) {
            print 'Notice: `' . $branch . '` does not exist, skipping merge for this branch.' . PHP_EOL;
        }
        elseif ($branch == $master) {
            // Gracefully skip
            // Can happen when merging into all branches
            // while submitting your own master branch other than production or master
        }
        else {
            print shell_exec('git checkout ' . $branch);
            $output = shell_exec('git merge --no-ff ' . $master);
            print $output;

            if (strstr($output, 'CONFLICT')) {
                $conflict = true;
                print 'There were errors merging `' . $master . '` into `' . $branch . '`. Please fix these conflicts in `' . $branch . '` and update your other local branches if you care to.' . PHP_EOL;
                exit(0);
            }
            else {
                print shell_exec('git push ' . $remote . ' ' . $branch);
            }
        }
    }

    print 'Auto-merge complete...' . PHP_EOL;
 }
 else {
    print 'Notice: Can\'t merge `' . $master . '` into itself silly.' . PHP_EOL;
 }
diff --git a/examples.md b/examples.md
	#!/usr/bin/php
	<?php

	// Normalize data in all branches
	$all_branches = explode(PHP_EOL, shell_exec('git branch'));
	foreach ($all_branches as $k => $branch) {
	$all_branches[$k] = trim(str_replace('*', '', $branch));
	}

	// Look for user submitted variables
	// 1 = comma delimited list of branches to merge into (default is all branches other than production or master)
	// 2 = branch to use to merge from (default will be master or production)
	$local = (isset($argv[1]) && ! empty($argv[1])) ? explode(',', $argv[1]) : $all_branches;
	$master = (isset($argv[2]) && ! empty($argv[2])) ? trim($argv[2]) : 'master';

	// Set some other vars
	$branches = array();
	$conflict = false;
	$remotes = explode(PHP_EOL, shell_exec('git remote'));
	$remote = (isset($remotes[0]) && ! empty($remotes[0])) ? trim($remotes[0]) : null;
	$remote = (empty($remote)) ? 'origin' : $remote;

	// Loop thru branches to make final list to merge into
	// Also find the master branch if not already submitted by the user
	foreach ($local as $branch) {
	if (($branch == 'production' \|\| $branch == 'master') && (! isset($argv[2]) \|\| empty($argv[2]))) {
	$master = $branch;
	}
	elseif (! empty($branch)) {
	array_push($branches, $branch);
	}
	}

	// Figure if master branch used for merging even exists
	if (! in_array($master, $all_branches)) {
	print 'Fatal: The branch `' . $master . '` to be used for merging from does not exist.' . PHP_EOL;
	exit(0);
	}

	// Check to make sure there is more than master branch
	$self_merge = (count($branches) == 1 && $branches[0] == $master) ? true : false;

	// If there are branches to merge into, make it happen
	if (! empty($branches) && $self_merge === false) {
	print 'Starting to auto-merge of `' . $master . '` into all other local branches...' . PHP_EOL;
	foreach ($branches as $branch) {
	// check to see if the branch we are checking out even exists
	// If not, skip it

	if (! in_array($branch, $all_branches)) {
	print 'Notice: `' . $branch . '` does not exist, skipping merge for this branch.' . PHP_EOL;
	}
	elseif ($branch == $master) {
	// Gracefully skip
	// Can happen when merging into all branches
	// while submitting your own master branch other than production or master
	}
	else {
	print shell_exec('git checkout ' . $branch);
	$output = shell_exec('git merge --no-ff ' . $master);
	print $output;

	if (strstr($output, 'CONFLICT')) {
	$conflict = true;
	print 'There were errors merging `' . $master . '` into `' . $branch . '`. Please fix these conflicts in `' . $branch . '` and update your other local branches if you care to.' . PHP_EOL;
	exit(0);
	}
	else {
	print shell_exec('git push ' . $remote . ' ' . $branch);
	}
	}
	}

	print 'Auto-merge complete...' . PHP_EOL;
	}
	else {
	print 'Notice: Can\'t merge `' . $master . '` into itself silly.' . PHP_EOL;
	}