Bash 变基 Git 存储库的脚本

Question

我正在尝试使用 Bash 脚本找到一种方法来重新定位存储库，我明白了，但是它返回了很多我不知道如何修复的错误，例如: ./bash.sh: line 3: $'\r': command not found

错误：

./bash.sh: line 3: $'\r': command not found
./bash.sh: line 6: $'\r': command not found
Updating Repo: /home/teste/ with url:
./bash.sh: line 8: $'\r': command not found
./bash.sh: line 16: syntax error near unexpected token `$'\r''
'/bash.sh: line 16: `(git fetch --all && git stash)

这是我得到的脚本

directory="/home/teste/" ## Where the server is located
original_dir="/root" ## Where we should back after the pull

cd $directory # switch to the git repo
repo_url=$(git config --get remote.origin.url)

echo "Updating Repo: $directory with url: $repo_url"

main_branch="master"
if [ "$repo_url" == "XXXXX" ]; then # if you have a repo where the primary branch isnt master
    $main_branch="trunk"
fi

# update the repo, then stash any local changes
echo -e "\ncalling: git fetch --all && git stash"
(git fetch --all && git stash)
current_branch=$(git rev-parse --abbrev-ref HEAD)

# switch to master/trunk branch and rebase it, then switch back to original branch
if [ $current_branch != $main_branch ]; then
    echo -e "\ncalling: git checkout $main_branch && git rebase && git checkout $current_branch"
    (git checkout $main_branch && git rebase && git checkout $current_branch)
fi

# rebase the original branch and then stash pop back to original state
echo -e "\ncalling: git rebase && git stash pop on branch: $current_branch"
(git rebase && git stash pop )

#switch back to the starting directory
cd $original_dir
echo ""

Answer 1

这是您的文件编码，而不是脚本本身 - windows 回车 returns 与 unix 格式不同。如果您使用的是 GUI 编辑器，请根据您的 OS.

将行结尾更改为 'unix' 或 'win' 格式

还有一个名为 dos2unix 的工具，您可以运行针对文件将行结尾转换为 unix 格式（反之亦然，unix2dos）。

在您的 .gitattributes 配置中，您还可以设置您想要的格式。这将确保您检出和提交的代码在将来得到相应的处理：

text eol=crlf # unix

或

text eol=lf # windows

参见：https://help.github.com/articles/dealing-with-line-endings/

请参阅此页面了解给这只猫蒙皮的其他方法。'\r': command not found - .bashrc / .bash_profile

Bash 变基 Git 存储库的脚本

Bash script that rebase Git repository

git

bash

rebase