Jeff King <peff@xxxxxxxx> writes:
> Anyway, here is a not-very-well-tested patch to get "git am" to apply on
> top of an empty repository (i.e., it worked on my utterly simplistic
> test case and I didn't think too hard about what else might have been
> broken). Maybe it will give a good start to somebody who wants to work
> on this.
The patch gets the ball rolling in a right direction, I think. In
addition, you need to audit --abort and --skip codepaths carefully,
though.
> diff --git a/git-am.sh b/git-am.sh
> index d339075..bcc600d 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -290,17 +290,23 @@ else
> : >"$dotest/rebasing"
> else
> : >"$dotest/applying"
> - git update-ref ORIG_HEAD HEAD
> + if git rev-parse --quiet --verify HEAD; then
> + git update-ref ORIG_HEAD HEAD
> + else
> + rm -f "$GIT_DIR/ORIG_HEAD"
> + fi
> fi
> fi
>
> case "$resolved" in
> '')
> - files=$(git diff-index --cached --name-only HEAD --) || exit
> - if test "$files"
> - then
> - : >"$dotest/dirtyindex"
> - die "Dirty index: cannot apply patches (dirty: $files)"
> + if git rev-parse --quiet --verify HEAD; then
> + files=$(git diff-index --cached --name-only HEAD --) || exit
> + if test "$files"
> + then
> + : >"$dotest/dirtyindex"
> + die "Dirty index: cannot apply patches (dirty: $files)"
> + fi
> fi
> esac
>
> @@ -541,7 +547,7 @@ do
> fi
>
> tree=$(git write-tree) &&
> - parent=$(git rev-parse --verify HEAD) &&
> + parent=$(git rev-parse --quiet --verify HEAD)
> commit=$(
> if test -n "$ignore_date"
> then
> @@ -552,7 +558,7 @@ do
> GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
> export GIT_COMMITTER_DATE
> fi &&
> - git commit-tree $tree -p $parent <"$dotest/final-commit"
> + git commit-tree $tree ${parent:+-p $parent} <"$dotest/final-commit"
> ) &&
> git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
> stop_here $this
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
