Tim Henigan <tim.henigan <at> gmail.com> writes:
> >> + do
> >> + cp "$file" "$git_top_dir/${file#$tmp/$right_dir/}"
> >> + done
> >> +fi
> >
> > This will copy new files created in $right_dir. Is that intended?
>
> hmmm...that was not intended. If would be odd for the user to create
> new files in this tmp directory, but if the diff tool automatically
> generates any files then this could result in unwanted files.
I think more generally, I would prefer if either side of the comparison is the
working copy that the temp directory on that side be populated with symlinks.
A particularly bad failure mode of the copy-back approach is:
git diffall --copy-back
# while my diffall tool is running, I edit the file somewhere else.
# quit my diffall tool
# --> my edits in the other tool are overwritten by diffall
Editing the files in place via symlinks would resolve that.
Matt
--
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