merge-and-ignore.sh

#!/bin/bash

source ./git-merge-and-ignore/functions.sh

MERGE_AND_IGNORE_FILE_NAME_TO_READ=.gitmergeandignore.sh
display_help() {
    echo "Usage: $0 [option...] {branch-to-merge} [wildcards-to-ignore...]" >&2
    echo
    echo "   -h, --help         Display this help message."
    echo "   -n, --no-read      Disable the read of wildcards from \"$MERGE_AND_IGNORE_FILE_NAME_TO_READ\"."
    echo
    exit 0
}

# --------------------------------- Setup -------------------------------------

# Assert the given amount of `ARGS` is legal.
ARGS=("$@")
NUMBER_OF_ARGS=${#ARGS[@]}
MINIMUM_NUMBER_OF_ARGS=1
if [ $NUMBER_OF_ARGS -lt $MINIMUM_NUMBER_OF_ARGS ]; then
    echo "Wrong number of arguments. Should be at least $MINIMUM_NUMBER_OF_ARGS, but was $NUMBER_OF_ARGS.";
    exit 1;
fi

# Default state is to enable read of wildcards from `MERGE_AND_IGNORE_FILE_NAME_TO_READ`.
IS_NO_READ=false

# Check if parameters options are given on the command line:
while :
do
    case "$1" in
      -n | --no-read)
          IS_NO_READ=true
          shift 1
          ;;
      -h | --help)
          display_help
          exit 0
          ;;
      --) # End of all options
          shift
          break
          ;;
      -*)
          echo "Error: Unknown option: $1" >&2
          # Or call function `display_help`
          exit 1
          ;;
      *)  # No more options
          break
          ;;
    esac
done
ARGS=("$@")
NUMBER_OF_ARGS=${#ARGS[@]}

# Extract wildcards from `MERGE_AND_IGNORE_FILE_NAME_TO_READ`.
MERGE_AND_IGNORE_FILE_NAME_TO_READ=.gitmergeandignore.sh
WILDCARDS_TO_IGNORE_FROM_FILE=()
if [ -e $MERGE_AND_IGNORE_FILE_NAME_TO_READ ] && ! $IS_NO_READ ; then
    WILDCARDS_TO_IGNORE_FROM_FILE=$(readFile $MERGE_AND_IGNORE_FILE_NAME_TO_READ)
fi

# Extract wildcards from `ARGS`.
WILDCARDS_TO_IGNORE_FROM_ARGS=("${ARGS[@]:1:$NUMBER_OF_ARGS}")

# Combine both wildcard arrays to a single array.
ALL_WILDCARDS_TO_IGNORE=(${WILDCARDS_TO_IGNORE_FROM_FILE[@]} ${WILDCARDS_TO_IGNORE_FROM_ARGS[@]})

# ---------------------------------- Code -------------------------------------

LOG_TITLE="### merge-and-ignore.sh ###: "
LOG_HALF_BOUNDARY_SHORT="###########################"
LOG_HALF_BOUNDARY="#$LOG_HALF_BOUNDARY_SHORT"

echo $LOG_HALF_BOUNDARY_SHORT START MERGE-AND-IGNORE $LOG_HALF_BOUNDARY

HAS_MERGE_STARTED_MESSAGE=$(git merge ${ARGS[0]} --no-ff --no-commit)
HAS_MERGE_STARTED_EXIT_CODE=$?

# Get all conflicted files as a long string.
conflictedFilesAsString=`git diff --name-only --diff-filter=U`

# Convert `conflictedFilesAsString` to a list of strings.
mapfile -t conflictedFiles <<< "$conflictedFilesAsString"

for wildcardToIgnore in $ALL_WILDCARDS_TO_IGNORE; do

    # If `$conflictedFiles[@]` contains `$wildcardToIgnore`:
    if printf '%s\0' "${conflictedFiles[@]}" | grep -Fxqz -- "$wildcardToIgnore" ; then
        isWildcardToIgnoreContainedWithinConflictedFiles=true

        # Choose arbitrarily to take a version of the file (ours/theirs/union).
        resolveConflictedFile --union "$wildcardToIgnore" > /dev/null 2>&1
    else
        isWildcardToIgnoreContainedWithinConflictedFiles=false
    fi

    echo Ignoring \"$wildcardToIgnore\"  # Output logs.

    git reset HEAD $wildcardToIgnore > /dev/null 2>&1   # Unstaging the current wildcard.
    git checkout -- $wildcardToIgnore > /dev/null 2>&1  # Reverting working-directory of the current wildcard.

    # In case `$wildcardToIgnore` was conflicted, clean its `.orig` file.
    [ "$isWildcardToIgnoreContainedWithinConflictedFiles" == true ] && git clean -f "$wildcardToIgnore.orig" > /dev/null 2>&1
done

echo $LOG_HALF_BOUNDARY_SHORT FINISH MERGE-AND-IGNORE $LOG_HALF_BOUNDARY_SHORT

# DEVELOPER NOTE: Choose one of the following options:
GIT_EDITOR=true git merge --continue  # DEVELOPER NOTE: Enable this line to enable `--no-edit`.
# git merge --continue  # DEVELOPER NOTE: Enable this line to disable `--no-edit`.

exit