28
fi
29
}
30
31
+# override die(): this version puts in an extra line break, so that
32
+# the progress is still visible
33
+
34
+die()
35
+{
36
+ echo >&2
37
+ echo "$*" >&2
38
+ exit 1
39
+}
40
+
41
# When piped a commit, output a script to set the ident of either
42
# "author" or "committer
43
191
export GIT_COMMIT=$commit
192
git cat-file commit "$commit" >../commit
193
184
- eval "$(set_ident AUTHOR <../commit)"
185
- eval "$(set_ident COMMITTER <../commit)"
186
- eval "$filter_env" < /dev/null
194
+ eval "$(set_ident AUTHOR <../commit)" ||
195
+ die "setting author failed for commit $commit"
196
+ eval "$(set_ident COMMITTER <../commit)" ||
197
+ die "setting committer failed for commit $commit"
198
+ eval "$filter_env" < /dev/null ||
199
+ die "env filter failed: $filter_env"
200
201
if [ "$filter_tree" ]; then
202
git checkout-index -f -u -a
203
# files that $commit removed are now still in the working tree;
204
# remove them, else they would be added again
205
git ls-files -z --others | xargs -0 rm -f
193
- eval "$filter_tree" < /dev/null
206
+ eval "$filter_tree" < /dev/null ||
207
+ die "tree filter failed: $filter_tree"
208
+
209
git diff-index -r $commit | cut -f 2- | tr '\n' '\0' | \
210
xargs -0 git update-index --add --replace --remove
211
git ls-files -z --others | \
212
xargs -0 git update-index --add --replace --remove
213
fi
214
200
- eval "$filter_index" < /dev/null
215
+ eval "$filter_index" < /dev/null ||
216
+ die "index filter failed: $filter_index"
217
218
parentstr=
219
for parent in $parents; do
222
done
223
done
224
if [ "$filter_parent" ]; then
209
- parentstr="$(echo "$parentstr" | eval "$filter_parent")"
225
+ parentstr="$(echo "$parentstr" | eval "$filter_parent")" ||
226
+ die "parent filter failed: $filter_parent"
227
fi
228
229
sed -e '1,/^$/d' <../commit | \
213
- eval "$filter_msg" | \
214
- sh -c "$filter_commit" "git commit-tree" $(git write-tree) \
215
- $parentstr > ../map/$commit
230
+ eval "$filter_msg" > ../message ||
231
+ die "msg filter failed: $filter_msg"
232
+ sh -c "$filter_commit" "git commit-tree" \
233
+ $(git write-tree) $parentstr < ../message > ../map/$commit
234
done <../revs
235
236
src_head=$(tail -n 1 ../revs | sed -e 's/ .*//')
267
[ -f "../map/$sha1" ] || continue
268
new_sha1="$(cat "../map/$sha1")"
269
export GIT_COMMIT="$sha1"
252
- new_ref="$(echo "$ref" | eval "$filter_tag_name")"
270
+ new_ref="$(echo "$ref" | eval "$filter_tag_name")" ||
271
+ die "tag name filter failed: $filter_tag_name"
272
273
echo "$ref -> $new_ref ($sha1 -> $new_sha1)"
274