Skip to content

Commit 8588b62

Browse files
committed
doc(script): Describe manual steps in the script
1 parent b20b01c commit 8588b62

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

scripts/reannex-to-tag.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,19 @@ EXEC="(${FIND_ADD}) | ${REMOVE_FROM_STDIN} && git annex add . && (${COMMIT_IF_NE
4040
# --strategy-option theirs = accept the working tree (original) changes over any files edited in this rebase
4141
# Find any added or changed files in the commit, remove and add with git-annex
4242
git rebase --committer-date-is-author-date --strategy-option=theirs --exec "$EXEC" $TAG
43+
44+
# The above rebase can pause, which ends this script.
45+
# If that happens, then everything after this should be run manually.
46+
#
47+
# The main reason for pauses is that we fix a file in an earlier commit
48+
# and a later commit deletes it. To preserve author intent, we need to
49+
# delete these files:
50+
#
51+
# git rm $(git diff --name-only --diff-filter=U) && git commit --no-edit && git rebase --continue
52+
#
53+
# I haven't figured out how to automate this, but that line does the job for now.
54+
55+
4356
# Clean up any newly empty commits
4457
git rebase --committer-date-is-author-date --no-keep-empty $TAG
4558

0 commit comments

Comments
 (0)