tree 83b7709c01f829236d9151fc576d04f4ebe5b46f
parent 37a6dd7aadf3380ddbe6418d5667e9dce42eff18
author Zane Bitter <zbitter@redhat.com> 1374069430 +0200
committer Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> 1374096659 -0700

Fix dirty index errors when resolving conflicts

The patch 6e8fdc58c786a45d7a63c5edf9c702f1874a7a19 causes StGit to raise
"warnings" (actually: errors) in the event that there are changes staged in
the index and a refresh is performed without specifying either --index or
--force. This is great for preventing an entire class of common mistakes,
but is also a giant pain when resolving conflicts after a pull/rebase.
Depending on the workflow in use, this may occur with a frequency anywhere
between "never" and "mulitple times on every pull".

This patch removes the pain by:
 - Reporting unresolved conflicts *before* complaining about staged
   changes, since it goes without saying that, when present, these are the
   main problem.
 - Not complaining about staged changes if there are no unstaged changes in
   the working directory, since the presence of --index is immaterial in
   this case.

Signed-off-by: Zane Bitter <zbitter@redhat.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>