diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4097214..cbe0153f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: sudo apt-get install -y bsdmainutils - name: Script run: | - ./check_integrity.sh $(find bin | cut -b 5- | xargs) + ./check_integrity.sh - name: Brew release if: matrix.platform == 'macos-latest' run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e7e7a34..7336c6f5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ Let's say you wish to add a new command. Assuming your new command is named `foo 5. (Optional) Update `./etc/bash_completion.sh`. 6. (Optional) Update `./etc/git-extras.fish`. 7. (Optional) Add a test under `./tests`. -8. Run `./check_integrity.sh foo` to check if all done. +8. Run `./check_integrity.sh foo` to check if all done. (You may also run `./check_integrity.sh` to check all commands.) You are welcome to open up an issue to discuss new commands or features before opening a pull request. diff --git a/check_integrity.sh b/check_integrity.sh index 16c2583a..b436e0d7 100755 --- a/check_integrity.sh +++ b/check_integrity.sh @@ -47,6 +47,11 @@ check_documentation() { err "Create man/$cmd.1 and man/$cmd.html via $(make_doc "$1")" fi + if [ "man/$cmd.md" -nt "man/$cmd.1" ] || [ "man/$cmd.md" -nt "man/$cmd.html" ] + then + err "man/$cmd.md, man/$cmd.1, and man/$cmd.html all exist, but man/$cmd.md is newer. You should rm man/$cmd.1 man/$cmd.html and then create man/$cmd.1 and man/$cmd.html via $(make_doc "$1")" + fi + check_git_extras_cmd_list "$@" check_man_page_index "$@" } @@ -77,12 +82,9 @@ check() { check_completion "$1" } -usage() { - echo >&2 "Usage: ./check_integrity.sh [ ...]" - exit 0 -} +test $# == 0 && set -- $(find bin | cut -b 5- | xargs) -test $# == 0 && usage +./bin/git-utimes --newer for name in "$@"; do name=${name#git-} diff --git a/man/git-extras.1 b/man/git-extras.1 index c922217b..c7d4af0a 100644 --- a/man/git-extras.1 +++ b/man/git-extras.1 @@ -1,6 +1,6 @@ .\" generated with Ronn-NG/v0.9.1 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1 -.TH "GIT\-EXTRAS" "1" "May 2023" "" "Git Extras" +.TH "GIT\-EXTRAS" "1" "September 2024" "" "Git Extras" .SH "NAME" \fBgit\-extras\fR \- Awesome GIT utilities .SH "SYNOPSIS" @@ -127,6 +127,8 @@ Change the default branch to \fB$BRANCH\fR\. If \fBgit\-extras\.default\-branch\ .IP "\[ci]" 4 \fBgit\-rename\-branch(1)\fR rename local branch and push to remote .IP "\[ci]" 4 +\fBgit\-rename\-file(1)\fR Rename a file or directory and ensure Git recognizes the change, regardless of filesystem case\-sensitivity\. +.IP "\[ci]" 4 \fBgit\-rename\-remote(1)\fR Rename a remote .IP "\[ci]" 4 \fBgit\-rename\-tag(1)\fR Rename a tag diff --git a/man/git-extras.html b/man/git-extras.html index d1fb5489..00ed5d0f 100644 --- a/man/git-extras.html +++ b/man/git-extras.html @@ -209,6 +209,8 @@

COMMANDS

  • git-rename-branch(1) rename local branch and push to remote
  • +git-rename-file(1) Rename a file or directory and ensure Git recognizes the change, regardless of filesystem case-sensitivity.
  • +
  • git-rename-remote(1) Rename a remote
  • git-rename-tag(1) Rename a tag
  • @@ -265,7 +267,7 @@

    SEE ALSO

    1. -
    2. May 2023
    3. +
    4. September 2024
    5. git-extras(1)
    diff --git a/man/git-extras.md b/man/git-extras.md index e959748f..8ea9d88c 100644 --- a/man/git-extras.md +++ b/man/git-extras.md @@ -79,7 +79,7 @@ git-extras(1) -- Awesome GIT utilities - **git-rebase-patch(1)** Rebases a patch - **git-release(1)** Commit, tag and push changes to the repository - **git-rename-branch(1)** rename local branch and push to remote - - **git-rename-file(1)** CRename a file or directory and ensure Git recognizes the change, regardless of filesystem case-sensitivity. + - **git-rename-file(1)** Rename a file or directory and ensure Git recognizes the change, regardless of filesystem case-sensitivity. - **git-rename-remote(1)** Rename a remote - **git-rename-tag(1)** Rename a tag - **git-repl(1)** git read-eval-print-loop