merge interrupted when discarding all ignored

Author: akostadinov

merge-overlay

@@ -353,8 +353,8 @@ while IFS= read -u 4 -r -d '' file; do
     # Auto-discard ignored files
     rm -f "$file"
   elif git_ignored_should_discard "$rel_path"; then
+    ((++GIT_IGNORED_COUNT)) # pre-increment to avoid returning non-zero status
     rm -f "$file"
-    ((GIT_IGNORED_COUNT++))
   else
     FILES+=("$rel_path")
   fi

tests/test-merge-overlay.expect

@@ -633,7 +633,7 @@ proc test_git_ignored_discard_all {} {
         -re {Git-ignored file detected:} {
             expect {
                 -re {How should git-ignored files be handled.*\?} {
-                    send "D\r"
+                    send "R\r"
                     expect {
                         "→ All git-ignored files will be discarded" {
                             # Should see "Discarded N git-ignored file(s)"
@@ -860,7 +860,7 @@ proc test_git_ignored_invalid_input {} {
                             # Now send valid input
                             expect {
                                 -re {How should git-ignored files be handled.*\?} {
-                                    send "D\r"
+                                    send "R\r"
                                     expect {
                                         "→ All git-ignored files will be discarded" {
                                             expect eof