merge-kernel: fixup adding files with CONFLICT(add/add) conflict type into index.
The usage of search pattern of the grep command is wrong in
"47063eb merge-kernel: add files with CONFLICT(add/add) conflict type into index."
The errorneous usage will cause failures for kernel merge under certain
conditions.
BUG=b:223526986
TEST=Test against the file generted by 'git merge'.
Change-Id: I33c99a416884aced2c3ac209675c96501f27b76c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3686856
Tested-by: Martin Faltesek <mfaltesek@google.com>
Reviewed-by: Martin Faltesek <mfaltesek@google.com>
Commit-Queue: Martin Faltesek <mfaltesek@google.com>
diff --git a/contrib/merge-kernel b/contrib/merge-kernel
index 9a694e3..1bfcbfe 100755
--- a/contrib/merge-kernel
+++ b/contrib/merge-kernel
@@ -828,7 +828,7 @@
die "Please resolve conflicts, commit changes, and then rerun the merge script.\nMake sure you have 'git rerere' enabled."
fi
echo "All conflicts resolved, continuing"
- content_conflicts=($(grep -e 'CONFLICT.*[content|add]' "${tmpfile}" \
+ content_conflicts=($(grep -e 'CONFLICT.*content' -e 'CONFLICT.*add/add' "${tmpfile}" \
| sed -e 's/.*Merge conflict in //'))
delete_conflicts=($(grep -e 'CONFLICT.*delete' "${tmpfile}" \
| awk '{print $3;}' ))
