Skip to main content

Browse the archive

Revision eab335c46d6677ff50e9fe94352150641bc05507 authored by David Aguilar on 10 October 2014, 08:19:47 UTC, committed by Junio C Hamano on 16 October 2014, 19:07:48 UTC 
mergetool: use more conservative temporary filenames
 
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.

Previously, foo/bar.ext in the worktree would result in e.g.

	./foo/bar.ext.BASE.1234.ext

This can be improved by having only a single .ext and using
underscore instead of dot so that the extension cannot be
misinterpreted.  The resulting path becomes:

	./foo/bar_BASE_1234.ext

Suggested-by: Sergio Ferrero <sferrero@ensoftcorp.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9e8f8de
Raw File
sha1-array.h 
#ifndef SHA1_ARRAY_H
#define SHA1_ARRAY_H

struct sha1_array {
	unsigned char (*sha1)[20];
	int nr;
	int alloc;
	int sorted;
};

#define SHA1_ARRAY_INIT { NULL, 0, 0, 0 }

void sha1_array_append(struct sha1_array *array, const unsigned char *sha1);
int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1);
void sha1_array_clear(struct sha1_array *array);

typedef void (*for_each_sha1_fn)(const unsigned char sha1[20],
				 void *data);
void sha1_array_for_each_unique(struct sha1_array *array,
				for_each_sha1_fn fn,
				void *data);

#endif /* SHA1_ARRAY_H */
back to top