Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:34
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder · David Aguilar <hidden>
- 2016-06-15 · Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder · David Aguilar <hidden>
- 2016-06-15 · Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder · Joachim Schmitz <hidden>
Junio C Hamano [off-list ref] writes:
David Aguilar [off-list ref] writes:quoted
Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton <redacted> Signed-off-by: David Aguilar <redacted> --- I consider this a final finishing touch on a new 1.8.1 feature, so hopefully we can get this in before 1.8.1.Does everybody have mktemp(1), which is not even in POSIX.1? I'm a bit hesitant to apply this to the upcoming release without cooking it in 'next' for sufficiently long time to give it a chance to be tried by wider audience.
One approach may be to do something like this as a preparation step (current callers of unpack-file may want to do their temporary work in TMPDIR as well), and then use git unpack-file -t e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 to create your empty temporary file. Documentation/git-unpack-file.txt | 10 +++++++--- builtin/unpack-file.c | 28 +++++++++++++++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index e9f148a..56af328 100644
--- a/Documentation/git-unpack-file.txt
+++ b/Documentation/git-unpack-file.txt@@ -10,16 +10,20 @@ git-unpack-file - Creates a temporary file with a blob's contents SYNOPSIS -------- [verse] -'git unpack-file' <blob> +'git unpack-file' [-t] <blob> DESCRIPTION ----------- Creates a file holding the contents of the blob specified by sha1. It -returns the name of the temporary file in the following format: - .merge_file_XXXXX +returns the name of the temporary file (by default `.merge_file_XXXXX`). + OPTIONS ------- +-t:: + The temporary file is created in `$TMPDIR` directory, + instead of the current directory. + <blob>:: Must be a blob id
diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 1920029..de1f845 100644
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c@@ -1,8 +1,9 @@ #include "builtin.h" -static char *create_temp_file(unsigned char *sha1) +static char *create_temp_file(unsigned char *sha1, int in_tempdir) { - static char path[50]; + static char path[1024]; + static const char template[] = ".merge_file_XXXXXX"; void *buf; enum object_type type; unsigned long size;
@@ -12,8 +13,12 @@ static char *create_temp_file(unsigned char *sha1) if (!buf || type != OBJ_BLOB) die("unable to read blob object %s", sha1_to_hex(sha1)); - strcpy(path, ".merge_file_XXXXXX"); - fd = xmkstemp(path); + if (in_tempdir) { + fd = git_mkstemp(path, sizeof(path) - 1, template); + } else { + strcpy(path, template); + fd = xmkstemp(path); + } if (write_in_full(fd, buf, size) != size) die_errno("unable to write temp-file"); close(fd);
@@ -23,14 +28,23 @@ static char *create_temp_file(unsigned char *sha1) int cmd_unpack_file(int argc, const char **argv, const char *prefix) { unsigned char sha1[20]; + int in_tempdir = 0; + + if (argc < 2 || 3 < argc || !strcmp(argv[1], "-h")) + usage("git unpack-file [-t] <sha1>"); + if (argc == 3) { + if (strcmp(argv[1], "-t")) + usage("git unpack-file [-t] <sha1>"); + in_tempdir = 1; + argc--; + argv++; + } - if (argc != 2 || !strcmp(argv[1], "-h")) - usage("git unpack-file <sha1>"); if (get_sha1(argv[1], sha1)) die("Not a valid object name %s", argv[1]); git_config(git_default_config, NULL); - puts(create_temp_file(sha1)); + puts(create_temp_file(sha1, in_tempdir)); return 0; }