我的自动 git 更新过程应该是什么样的？

Question

I come from a subversion background and recently my company made the switch to git. I used to have a cron entry, on my laptop, to update the multitude of checkouts, on a nightly basis. This way, I would be running against current versions of the different components of our system; especially the parts that I wasn't actively developing, but had dependencies on. I would like to achieve the same thing with git.

Here's my old update process with svn:

#!/bin/bash -e
checkout="$1"
svn update --accept postpone ${checkout}
# Run a script to report conflicts that I would resolve in the morning.

I've read a lot of blogs posts on the topic and asked around, and I haven't found many consistent answers. Also, none of the solutions I've seen so far are complete to the extent that I am looking for. I've taken all those opinions and created the script below.

How should I deal with submodules?

Are there situations, or gotchas, I have not accounted for?

#!/bin/bash -e
checkout="$1"
now=$(date +%Y%m%dT%H%M%S)
cd ${checkout}

# If you are in the middle of a rebase, merge, bisect, or cherry pick, then don't update.
if [ -e .git/rebase-merge ]; then continue; fi
if [ -e .git/MERGE_HEAD ]; then continue; fi
if [ -e .git/BISECT_LOG ]; then continue; fi
if [ -e .git/CHERRY_PICK_HEAD ]; then continue; fi

# Determine what branch the project is on, if any.
ref=$(git branch | grep '^*' | sed 's/^* //')

if [[ $ref = "(no branch)" ]]; then
  # The directory is in a headless state.
  ref=$(git rev-parse HEAD)
fi

# If there are any uncommitted changes, stash them.
stashed=false
if [[ $(git status --ignore-submodules --porcelain | grep -v '^??') != "" ]]; then
    stashed=true
    git stash save "auto-${now}"
fi

# If there are any untracked files, add and stash them.
untracked=false
if [[ $(git status --ignore-submodules --porcelain) != "" ]]; then
    untracked=true
    git add .
    git stash save "auto-untracked-${now}"
fi

# If status is non-empty, at this point, something is very wrong, fail.
if [[ $(git status --ignore-submodules --porcelain) != "" ]]; then continue; fi

# If not on master, checkout master.
if [[ $ref != "master" ]]; then
    git checkout master
fi

# Rebase upstream changes.
git pull --rebase

# Restore branch, if necessary.
if [[ $ref != "master" ]]; then
    git checkout ${ref}
fi

# Restore untracked files, unless there is a conflict.
if $untracked; then
    stash_name=$(git stash list | grep ": auto-untracked-${now}\$" | sed "s/^\([^:]*\):.*$/\\1/")
    git stash pop ${stash_name}
    git reset HEAD .
fi

# Restore uncommitted changes, unless there is a conflict.
if $stashed; then
    stash_name=$(git stash list | grep ": auto-${now}\$" | sed "s/^\([^:]*\):.*$/\\1/")
    git stash pop ${stash_name}
fi

# Update submodules.
git submodule init
git submodule update --recursive

Thank you.

Answer 1

I got this error when I had duplicate submodule request in my.gitmodules file.

Answer 2

You need to check if there are changes in the submodules as well. See git submodule foreach .