oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
1
Fork 0
Code Issues Pull Requests Activity

home/git: add fixup-interactive script

This commit is contained in:
Oystein Kristoffer Tveit 2024-11-14 14:03:36 +01:00
parent 35e75ec9ad
commit e0a957e448
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home/programs/git/default.nix
View File

@ -52,6 +52,7 @@ in
authors = "shortlog --summary --numbered --email"; authors = "shortlog --summary --numbered --email";
si = "switch-interactive"; si = "switch-interactive";
ff = "fixup-fixup"; ff = "fixup-fixup";
fi = "fixup-interactive";
rf = "rebase-fixups"; rf = "rebase-fixups";
pp = "post-pr"; pp = "post-pr";
subs = "submodule update --init --recursive"; subs = "submodule update --init --recursive";
@ -335,6 +336,11 @@ in
runtimeInputs = with pkgs; [ cfg.package gnused ]; runtimeInputs = with pkgs; [ cfg.package gnused ];
text = lib.fileContents ./scripts/git-rebase-fixups.sh; text = lib.fileContents ./scripts/git-rebase-fixups.sh;
}) })
(pkgs.writeShellApplication {
name = "git-fixup-interactive";
runtimeInputs = with pkgs; [ cfg.package gnused gnugrep fzf ];
text = lib.fileContents ./scripts/git-fixup-interactive.sh;
})
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "git-switch-interactive"; name = "git-switch-interactive";
runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ]; runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ];

18
home/programs/git/scripts/git-fixup-interactive.sh Normal file
View File

@ -0,0 +1,18 @@
if [ -n "${1:-}" ]; then
TARGET_BRANCH="$1"
shift
else
TARGET_BRANCH=$(git remote show origin | sed -n '/HEAD branch/s/.*: //p')
fi
FORK_POINT=$(git merge-base --fork-point "$TARGET_BRANCH")
COMMITS_SINCE_FORK_POINT=$(git log --format=format:'%s' "$FORK_POINT"..HEAD | grep -v -E '^fixup!')
RESULT=$(fzf <<<"$COMMITS_SINCE_FORK_POINT")
if [ "$RESULT" == "" ]; then
echo "Doing nothing..."
else
git commit -m "fixup! $RESULT" "$@"
fi