Skip to content

Store exact submodule commit for --treeish #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Store exact submodule commit for --treeish #42

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f11a32
Store submodule commits bounded for `HEAD` of top repository
KSR-Yasuda Feb 7, 2024
388a0a4
Store exact submodule commits for direct submodule.
KSR-Yasuda Feb 8, 2024
1c522f9
Try to search non-direct submodule's exact commit
KSR-Yasuda Feb 8, 2024
acfe11d
Use `git rev-parse --show-toplevel` to get each submodule's top dir i…
KSR-Yasuda Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions git-archive-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,40 @@ fi
if [ $VERBOSE -eq 1 ]; then
echo -n "archiving submodules..."
fi
git submodule >>"$TMPLIST"

TOP_TREEISH=$TREEISH
TOP_TREEISH_HASH=$(git rev-parse "$TOP_TREEISH")
TOP_HEAD_HASH=$(git rev-parse HEAD)
git submodule status --recursive --cached >> "$TMPLIST"
while read path; do
TREEISH=$(grep "^ .*${path%/} " "$TMPLIST" | cut -d ' ' -f 2) # git submodule does not list trailing slashes in $path
# git submodule does not list trailing slashes in $path. Remove it in $TREEISH search.
TREEISH=$(git ls-tree "${TOP_TREEISH}" "${path%/}" | awk '{ print $3 }')

if [ -z "$TREEISH" ]; then
# It is not top repo's direct submodule.
ppath=$(realpath --relative-base="${PWD}" "$(git -C "${path%/*/}" rev-parse --show-toplevel)")
pathbase=$(realpath --relative-base="${ppath}" "${path%/}")

PARENT_TREEISH=$(sed -nr -e 's@^[ +-]@@' -e 's@ +\(.*\)$@@' -e 's@([^ ]+) +'"${ppath}"'$@\1@ p' "$TMPLIST" | tail -n1)
if [ -n "$PARENT_TREEISH" ]; then
TREEISH=$(git -C "${ppath}" ls-tree "${PARENT_TREEISH}" "${pathbase}" | awk '{ print $3 }')
fi
fi

if [ -z "$TREEISH" ]; then
if [ "$TOP_TREEISH_HASH" != "$TOP_HEAD_HASH" ]; then
echo >&2 -e "\e[33;1mWarning:\e[22m Submodule \"${path%/}\" hash for top repo's ${TOP_TREEISH} was not obtained. Use the commit for top repo's HEAD.\e[m"
fi

TREEISH=$(sed -nr -e 's@^[ +-]@@' -e 's@ +\(.*\)$@@' -e 's@([^ ]+) +'"${path%/}"'$@\1@ p' "$TMPLIST" | tail -n1)
if [ -z "$TREEISH" ]; then
echo >&2 -e "\e[33;1mWarning:\e[22m Submodule \"${path%/}\" hash for top repo's HEAD was not obtained. Use the commit for the submodule's HEAD.\e[m"
TREEISH=HEAD
fi
fi
echo " ${TREEISH} ${path%/}" >> "${TMPLIST}" # Update the chosen commit
echo >&2 "Submodule \"${path%/}\" commit for top repo's ${TOP_TREEISH}: ${TREEISH:-HEAD} ($(git -C ${path} name-rev --name-only "${TREEISH}"))"

cd "$path"
rm -f "$TMPDIR"/"$(echo "$path" | sed -e 's/\//./g')"$FORMAT
git archive --format=$FORMAT --prefix="${PREFIX}$path" $ARCHIVE_OPTS ${TREEISH:-HEAD} > "$TMPDIR"/"$(echo "$path" | sed -e 's/\//./g')"$FORMAT
Expand Down