I was also inclined to suggest a GR book for intro to tensor analysis/differential geometry. However, there usually you find the treatment in terms of holonomic coordinates or the abstract coordinate free treatment, but usually only a minority of physics students need these ever in their lives and for sure not in the first semesters. There you usually need the classical vector analysis of 3D Euclidean space in Cartesian and orthonormal curvilinear coordinates. I've not found a book, where this is done in a way which completely satifies me, I must admit. A very good review is found in my favorite classical-physics books: A. Sommerfeld, Lectures on Theoretical Physics, vol. II (Fluid Dynamics).
Of the many books on GR, for my taste the best intro to this topic (in terms of the Ricci calculus in holonomic coordinates) is found in
H. Stephan, Relativity - An introduction to special and general relativity, 3rd edition, CUP 2004