On Aug 19, 2007, at 11:25 PM, Junio C Hamano wrote:
Evan Phoenix <evan@xxxxxxxxxxxxxxx> writes:
The current message is a bit cryptic, indicating that only
changes which contained merge conflicts should be added to the
index, but in fact, all outstanding changes must be.
That might be true, and we might want a better yet still concise
wording for the suggestion.
Your wording, however, would lead a new user to run "git add"
even before resolving the conflicts, and then make him complain
"why doesn't git do that for me", and then again complain "gaah,
I followed the suggestion and ended up committing garbage with
funny <<< === >>> lines in it".
Hm, a good point.
How about something like
"Please verify all merge conflicts in all modified files, then run
'git add' to resolve them."
Or perhaps the behavior of rebase needs to be altered a bit
here. 'git ls-files -u' can detect there exists outstanding, unmerged
files. If those still exist, it should certainly stop outright. But,
it seems to me that if there are no unmerged files and still just
normal modified ones (git ls-files -m), 'git rebase --continue' should
be able to run 'git add -u' for the user.
Outside that, I do agree that the wording should be more stern about
checking all modified files before running 'git add'.
So in that sense, I do not necessarily see _your_ new wording an
improvement.
@@ -135,8 +135,12 @@ do
case "$1" in
--continue)
git diff-files --quiet || {
- echo "You must edit all merge conflicts and then"
- echo "mark them as resolved using git add"
+ echo "Unable to continue rebase:"
+ echo " All modified files must be added
to index first."
Also I see whitespace breackages here --- did you intend to
replace tabs with spaces, and if so why?
A mistake on my part. I sent in a new patch eariler but ended up having
mail server troubles. I've already got a new version that keeps the
tabs as they should be. The next version will be proper.
- Evan Phoenix / evan@xxxxxxxxxxxxxxx
-
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
