Merge branch 'main' into hyperupcall-bats-2

Author: hyperupcall

.github/workflows/ci.yml

@@ -6,56 +6,90 @@ on:
     branches: [main]
 jobs:
   lint:
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
     steps:
-      - name: 'Get Changed Files'
-        id: 'files'
-        uses: 'masesgroup/retrieve-changed-files@v3'
-        with:
-          format: 'json'
-        # a force push will cause the action above to fail. Don't do force push when people are
-        # reviewing!
       - name: Check out code.
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: 'Get Changed Files'
+        id: 'files'
+        run: |
+          CHANGED_FILES=$(git diff --name-only "${BASE_SHA:-$BEFORE_SHA}...${HEAD_SHA:-$GITHUB_REF}")
+          echo "::notice::Changed files: $CHANGED_FILES"
+          {
+            echo "added_modified<<EOF"
+            echo "$CHANGED_FILES"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          BEFORE_SHA: "${{ github.event.before }}"
       - uses: 'actions/setup-go@v5'
         with:
           go-version: '1.20'
+      - name: 'Install EditorConfig Lint'
+        run: go install 'github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@latest'
       - name: 'Check EditorConfig Lint'
-        run: |
-          sudo apt install -y jq
-          go install 'github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@latest'
-
-          readarray -t changed_files <<<"$(jq -r '.[]' <<<'${{ steps.files.outputs.added_modified }}')"
-          ~/go/bin/editorconfig-checker ${changed_files[@]}
+        run: echo "$FILES" | xargs ~/go/bin/editorconfig-checker
+        env:
+          # NOTE: use env to pass the output in order to avoid possible injection attacks
+          FILES: "${{ steps.files.outputs.added_modified }}"
+      - name: Shellcheck
+        run: shellcheck --severity=error bin/* ./*.sh
+      - name: Lint and format Python with Ruff
+        uses: astral-sh/ruff-action@v3
 
   typo:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code.
         uses: actions/checkout@v4
+      - name: Install poetry
+        run: pip install poetry
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          cache: 'poetry'
+          cache-dependency-path: "tests/pyproject.toml"
+          python-version-file: "tests/pyproject.toml"
+      - name: Install dependencies
+        run: |
+          cd tests || exit
+          poetry install --only dev
       - name: spell check
         run: |
-          pip install codespell==2.2
-          git grep --cached -l '' | grep -v -e 'History\.md' -e 'AUTHORS' -e 'man/.*\.1' -e 'man/.*\.html' | xargs codespell --ignore-words=.github/.ignore_words
+          cd tests
+          git grep --cached -l '' .. | \
+            grep -v -e 'History\.md' -e 'AUTHORS' -e 'man/.*\.1' -e 'man/.*\.html' | \
+            xargs poetry run codespell --ignore-words=../.github/.ignore_words
 
   test:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.12
+      - name: Install poetry
+        run: pip install poetry
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+          cache: 'poetry'
+          cache-dependency-path: "tests/pyproject.toml"
+          python-version-file: "tests/pyproject.toml"
       - name: Install Python Dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install pytest==8.1.2 GitPython==3.1.43 testpath==0.6.0
-      - name: Setup Bats and bats libs
+          cd tests || exit
+          poetry install --only test
+      - name: Setup Bats
         id: setup-bats
         uses: bats-core/bats-action@3.0.0
       - name: Test with Pytest
-        run: make test
+        run: |
+          cd tests
+          poetry run pytest
       - name: Test with Bats
         env:
          BATS_LIB_PATH: ${{ steps.setup-bats.outputs.lib-path }}
@@ -75,11 +109,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Linux Install
         if: matrix.platform == 'ubuntu-latest'
-        run: |
-          sudo apt-get install -y bsdmainutils
+        run: sudo apt-get install -y bsdmainutils
       - name: Script
-        run: |
-          ./check_integrity.sh
+        run: ./check_integrity.sh
       - name: Brew release
         if: matrix.platform == 'macos-latest'
         run: |

AUTHORS

@@ -1,12 +1,8 @@
-git-extras is written and maintained by TJ Holowaychuk and
-various contributors:
-
-Development Lead
-````````````````
-- TJ Holowaychuk <tj@vision-media.ca>
+git-extras is written and maintained by various contributors:
 
 Maintainers
 ```````````
+- TJ Holowaychuk <tj@vision-media.ca>
 - Hemanth.HM <hemanth.hm@gmail.com>
 - Nimit Kalra <me@nimit.io>
 - Nicolai Skogheim <nicolai.skogheim@gmail.com>
@@ -37,6 +33,7 @@ Patches and Suggestions
 - David Baumgold
 - Jan Schulz
 - Kenneth Reitz
+- Leroy
 - Mark Pitman
 - Peter Benjamin
 - Günther Grill
@@ -49,6 +46,7 @@ Patches and Suggestions
 - Ross Smith II
 - Yi EungJun
 - grindhold
+- wyattscarpenter
 - Aggelos Orfanakos
 - Camille Reynders
 - Carlos Prado
@@ -70,6 +68,7 @@ Patches and Suggestions
 - Justin Dugger
 - Nils Winkler
 - Philipp Klose
+- Raphael Boidol
 - Richard Russon
 - Sam Bostock
 - Vladimir Jimenez
@@ -110,6 +109,7 @@ Patches and Suggestions
 - Wil Moore III
 - William Montgomery
 - Ye Lin Aung
+- dependabot[bot]
 - luozexuan
 - roxchgt
 - soffolk
@@ -146,6 +146,7 @@ Patches and Suggestions
 - Christophe Badoit
 - Ciro Nunes
 - CleanMachine1
+- CodeByZach
 - Craig MacGregor
 - Dan Goodliffe
 - Dan Jackson
@@ -174,6 +175,7 @@ Patches and Suggestions
 - James Manning
 - James Zhu
 - Jan Krueger
+- Jared Baur
 - Jarod Stewart
 - Jason Young
 - Jens K. Mueller
@@ -201,7 +203,9 @@ Patches and Suggestions
 - Mathieu D. (MatToufoutu)
 - Matt
 - Matt Colyer
+- Matt Headley
 - Matthew Avant
+- Mattias Andersson
 - Michael Komitee
 - Michael Matuzak
 - Michele Bologna
@@ -224,6 +228,7 @@ Patches and Suggestions
 - Raphael Fleischlin
 - Rasmus Wriedt Larsen
 - René
+- Revisor
 - Riceball LEE
 - Rob Kennedy
 - Robin von Bülow
@@ -254,6 +259,8 @@ Patches and Suggestions
 - Vitaly Chikunov
 - Wei Lee
 - Wei Wu
+- Wen Sun
+- Wiktor Żurawik
 - Xavier Krantz
 - Xiaopei Li
 - Zeeshan Ahmed
@@ -270,7 +277,6 @@ Patches and Suggestions
 - sgleizes
 - tfendin
 - tiemonl
-- Zachary Miller
 - zentarul
 - zeroDivisible
 - zhiyanfoo

Commands.md

@@ -12,6 +12,7 @@
  - [`git clear-soft`](#git-clear-soft)
  - [`git coauthor`](#git-coauthor)
  - [`git commits-since`](#git-commits-since)
+ - [`git continue`](#git-continue)
  - [`git contrib`](#git-contrib)
  - [`git count`](#git-count)
  - [`git cp`](#git-cp)
@@ -279,11 +280,20 @@ usage: git bulk [-g] ([-a]|[-w <ws-name>]) <git command>
        git bulk --listall
 ```
 
-  Register a workspace so that `git bulk` knows about it (notice that <ws-root-directory> must be absolute path):
+  Register a workspace so that `git bulk` knows about it (it will be registered in your `.gitconfig`):
 
 ```bash
 $ git bulk --addworkspace personal ~/workspaces/personal
 ```
+
+  Notice that `<ws-root-directory>` must be an absolute path (or an environment variable pointing to an absolute path).
+  In the case of a **single quoted environment variable**, it will be dereferenced at `git-bulk` runtime, suitable for dynamic workspaces (*e.g.*, defined in your `.bashrc`).
+  As an illustration:
+
+```bash
+$ git bulk --addworkspace personal '$PERSONAL_WORKSPACE'
+```
+
   With option `--from` the URL to a single repository or a file containing multiple URLs can be added and they will be cloned directly into the workspace. Suitable for the initial setup of a multi-repo project.
 
 ```bash
@@ -415,9 +425,9 @@ $ git coauthor user user@email.com
  2 files changed, 145 insertions(+), 0 deletions(-)
  create mode 100644 README.md
  create mode 100644 CONTRIBUTING.md
- 
+
  $ git log -1
- 
+
 commit b62ceae2685e6ece071f3c3754e9b77fd0a35c88 (HEAD -> master)
 Author: user person <userperson@email.com>
 Date:   Sat Aug 17 17:33:53 2019 -0500
@@ -1368,7 +1378,7 @@ Switched to branch 'mr/51'
 With full URL, the head is fetched from a temporary remote pointing to the base URL.
 
 ``` bash
-$ git mr https://gitlab.com/owner/repository/merge_requests/51 
+$ git mr https://gitlab.com/owner/repository/merge_requests/51
 From gitlab.com:owner/repository
  * [new ref]         refs/merge-requests/51/head -> mr/51
 Switched to branch 'mr/51'
@@ -1623,3 +1633,7 @@ Abort current revert, rebase, merge or cherry-pick, without the need to find exa
 ## git magic
 
 Commits changes with a generated message.
+
+## git continue
+
+Continue current revert, rebase, merge or cherry-pick, without the need to find exact command in history.

History.md

@@ -1,4 +1,28 @@
 
+7.3.0 / 2024-10-20
+==================
+
+  * Fix stripping trailing forward slash for git-get (#1172)
+  * Change git-cp to use cleaner branch approach (#1169)
+  * Improve warning for `git clear` (#1168)
+  * Enhance `git-repl` (#1160)
+  * Update some documentation that was out of sync (#1164)
+  * Use filetimes in check_integrity (#1162)
+  * Update git-alias.md: add brs to prevent incorrect line behavior (#1161)
+  * Update git-bulk.md: use correct stylization in synopsis (#1163)
+  * Update git-repl.md: typo: "let's" for "lets" (#1158)
+  * Update instructions for the OpenSUSE installation (#1157)
+  * Add pathspec support in `git-missing` (#1156)
+  * feat: add rename-file command (#1149)
+  * Update Commands.md (#1148)
+  * fix: git-summary commit count (#1147)
+  * tests: update dependencies (#1142)
+  * chore(deps): bump masesgroup/retrieve-changed-files from 2 to 3 (#1144)
+  * chore(deps): bump actions/setup-go from 4 to 5 (#1143)
+  * ci: add dependabot update for GitHub actions (#1141)
+  * ci: update actions (#1140)
+  * Bump version to 7.3.0-dev (#1139)
+
 7.2.0 / 2024-04-21
 ==================
 

bin/git-abort

@@ -1,17 +1,42 @@
 #!/usr/bin/env bash
 
-gitdir="$(git rev-parse --git-dir)" || exit
-opfound=
-fcnt=
-for i in cherry-pick merge rebase revert; do
-  f=${i^^}
-  f=${f/-/_}
-  test -f "${gitdir}/${f}_HEAD" && fcnt=1$fcnt && opfound=$i
-done
+set -euo pipefail
 
-if [ "${fcnt}" != 1 ]; then
-  echo "I don't know what to abort" >&2
-  exit 1
-fi
+function discover_op() {
+  local gitdir
+  # git rev-parse emits an error if not in a git repo so only need to bail out
+  gitdir="$(git rev-parse --git-dir)" || exit
+  local op
+  for op in cherry_pick merge rebase revert ; do
+      if [ -f "${gitdir}/${op^^}_HEAD" ]; then
+          echo "${op/_/-}"
+      fi
+  done
+}
 
-git "${opfound}" --abort
+function validate_op() {
+  local op="$1"
+  if [ -z "$op" ]; then
+    echo "No active operation found" >&2
+    exit 1
+  fi
+  if [[ "$(echo "$op" | wc -l)" -gt 1 ]]; then
+    echo "Multiple active operations found: $op" >&2
+    exit 1
+  fi
+}
+
+function discover_action() {
+    local action=${1/git-/}
+    if [ "$action" != "abort" ] && [ "$action" != "continue" ]; then
+        echo "Invalid action: $1" >&2
+        exit 1
+    fi
+    echo "$action"
+}
+
+action=$(discover_action "$(basename "$0")")
+op=$(discover_op)
+validate_op "$op"
+
+git "$op" "--$action"