From 347a68546c0d7df97000bc2a80ebd1d5ceb39e40 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 24 Jan 2020 17:14:45 +0300 Subject: .gitconfig: no more external scripts --- %HOME%/.local/bin/git-fixup | 58 --------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100755 %HOME%/.local/bin/git-fixup (limited to '%HOME%/.local/bin/git-fixup') diff --git a/%HOME%/.local/bin/git-fixup b/%HOME%/.local/bin/git-fixup deleted file mode 100755 index 3883f10..0000000 --- a/%HOME%/.local/bin/git-fixup +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2018 Egor Tensin -# This file is part of the "Linux/Cygwin environment" project. -# For details, see https://github.com/egor-tensin/linux-home. -# Distributed under the MIT License. - -set -o errexit -o nounset -o pipefail - -if ! git rev-parse --is-inside-work-tree > /dev/null 2>&1 ; then - echo 'Not inside a Git repository.' >&2 - exit 1 -fi - -if ! git rev-parse HEAD > /dev/null 2>&1 ; then - echo "Where's your HEAD?" >&2 - exit 1 -fi - -has_staged_changes= -git diff --cached --ignore-submodules --quiet || has_staged_changes=1 - -has_unstaged_changes= -git diff --ignore-submodules --quiet || has_unstaged_changes=1 - -if [ -z "$has_staged_changes" ] && [ -z "$has_unstaged_changes" ]; then - echo 'No staged or unstaged changes, seemingly?' >&2 - exit 1 -fi - -add=-a -[ -n "$has_staged_changes" ] && add= - -numof_parents="$( git rev-list --parents -n 1 HEAD | wc --words )" -if [ "$numof_parents" -eq 1 ]; then - dest_ref=--root -elif [ "$numof_parents" -eq 2 ]; then - dest_ref='HEAD^^' -else - echo 'Sure you want to fixup a merge commit?' >&2 - exit 1 -fi - -git commit $add --fixup=HEAD - -stash= -[ -n "$has_staged_changes" ] && [ -n "$has_unstaged_changes" ] && stash=1 - -unstash() { - git stash pop --quiet -} - -if [ -n "$stash" ]; then - git stash push --quiet - trap unstash EXIT -fi - -GIT_EDITOR=true git rebase -i --autosquash "$dest_ref" -- cgit v1.2.3