On 2012-04-22 17:03, Jonathan Nieder wrote: | jaalto wrote: | > On 2012-04-22 21:52, Guillem Jover wrote: | | > | but it seems | > | to me those are just somewhat bogus anyway, did you manually create | > | that patch or maybe it was extracted from a mail client that mangles | > | the body (evolution for example)? | > | > It was straight diff from git 1.7.10: | > | > git COMMIT COMMIT -- FILE > output.patch | | Are you sure? Can you send the exact command line and "git config -l | | grep diff" output?
Unfortunately I'm not sure, now that I think of it. The diff was combination of git + filterdiff + editing the headers in Emacs. It looks like Emacs diff-mode does something to it on save. Here is test without any personal Emacs setup: emacs -Q -ne <file> <add space, delete space (to flag modified); then save with new name> I'm attaching the result below, which I think exhibits the changes as in original bug report *.patch file. Jari [*] The new, saved, file is still fine for patch(1) and quilt(1).
13c13$ < ^I${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}$ ---$ > ^I${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}$ 16c16$ < ^Imkdir -p ${PREFIX}/bin;\$ ---$ > ^Imkdir -p ${PREFIX}/bin;\$ 19c19$ < ^Icp bcrypt ${PREFIX}/bin;\$ ---$ > ^Icp bcrypt ${PREFIX}/bin;\$ 22c22$ < ^Ichmod 755 ${PREFIX}/bin/bcrypt;\$ ---$ > ^Ichmod 755 ${PREFIX}/bin/bcrypt;\$ 27c27$ < ^I${COMPILE} -c main.c$ ---$ > ^I${COMPILE} -c main.c$ 30c30$ < ^I${COMPILE} -c endian.c$ ---$ > ^I${COMPILE} -c endian.c$ 35c35$ < ^Irm -rf *.o bcrypt bcrypt.core core bcrypt.tgz $ ---$ > ^Irm -rf *.o bcrypt bcrypt.core core bcrypt.tgz $
diff --git a/Makefile b/Makefile index b84da0f..8924de4 100644 --- a/Makefile +++ b/Makefile @@ -4,18 +4,18 @@ CFLAGS = -O2 -Wall COMPILE = ${CC} ${CFLAGS} OBJS = main.o blowfish.o rwfile.o keys.o wrapbf.o endian.o wrapzl.o LDFLAGS = -L/usr/local/lib -lz -PREFIX = /usr/local +PREFIX = ${DESTDIR}/usr/ bcrypt: ${OBJS} Makefile ${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS} install: bcrypt Makefile mkdir -p ${PREFIX}/bin;\ - mkdir -p ${PREFIX}/man/man1;\ + mkdir -p ${PREFIX}/share/man/man1;\ cp bcrypt ${PREFIX}/bin;\ - cp bcrypt.1 ${PREFIX}/man/man1;\ + cp bcrypt.1 ${PREFIX}/share/man/man1;\ chmod 755 ${PREFIX}/bin/bcrypt;\ - chmod 644 ${PREFIX}/man/man1/bcrypt.1 + chmod 644 ${PREFIX}/share/man/man1/bcrypt.1 main.o: main.c ${DEFAULTS} ${COMPILE} -c main.c @@ -38,6 +38,8 @@ wrapzl.o: wrapzl.c ${DEFAULTS} endian.o: endian.c ${DEFAULTS} ${COMPILE} -c endian.c +distclean: clean + clean: rm -rf *.o bcrypt bcrypt.core core bcrypt.tgz