Re: [PATCHv3 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

On Mon, Aug 9, 2010 at 19:22, Elijah Newren [off-list ref] wrote:

On Mon, Aug 9, 2010 at 1:09 PM, Junio C Hamano [off-list ref] wrote:

quoted

Elijah Newren [off-list ref] writes:

<snip>

quoted

quoted

+modify () {
+     sed -e "$1" < "$2" > "$2".x &&
+     mv "$2".x "$2"
+}

Just a style thing but I'd prefer to see the above written like this:

       modify () {
               sed -e "$1" <"$2" >"$2.x" &&
               mv "$2.x" "$2"
       }

I copied this function verbatim from t/t4127-apply-same-fn.sh.  Would
you like me to fix that one too?

Rather than copy-paste this around we should just turn it into a
utility function.

It'd be very useful (if you're up to it) to just use sed in this
patch, then submit another patch to include the modify() function in
the test-lib.sh (and document it in t/README).

These could also use a modify():

    cd t && grep -A1 sed  *sh | grep -B1 mv | less