Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-22 Thread David Aguilar
On Fri, Dec 21, 2012 at 8:08 AM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: Use $TMPDIR when creating the /dev/null placeholder for p4merge. This keeps it out of the current directory. The usual $REMOTE this is theirs and $LOCAL this is ours are still

Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-22 Thread David Aguilar
On Sat, Dec 22, 2012 at 1:56 PM, David Aguilar dav...@gmail.com wrote: FWIW I'm seeing a Bus Error when doing git update-index --refresh in a repository with large files on a 32bit machine. I'm not sure if that counts as a regression since the same error occurs in 1.7.10.4 (debian testing).

Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-21 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: Use $TMPDIR when creating the /dev/null placeholder for p4merge. This keeps it out of the current directory. The usual $REMOTE this is theirs and $LOCAL this is ours are still created in the current directory, no? It is unclear why this this side does

Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: By the way, who is going to remove this temporary file once the command is done? Nevermind; I can see that once the backend returns it is removed in the same function. -- To unsubscribe from this list: send the line unsubscribe git in the body of a