2005-04-08 02:16:10 +04:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2006-06-14 00:21:42 +04:00
|
|
|
#include "builtin.h"
|
2005-04-08 02:13:13 +04:00
|
|
|
#include "cache.h"
|
2006-04-02 16:44:09 +04:00
|
|
|
#include "tree.h"
|
2006-04-24 03:52:35 +04:00
|
|
|
#include "cache-tree.h"
|
2005-04-08 02:13:13 +04:00
|
|
|
|
2006-04-26 12:20:50 +04:00
|
|
|
static const char write_tree_usage[] =
|
|
|
|
"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
|
2005-12-06 09:30:07 +03:00
|
|
|
|
2006-06-14 00:21:42 +04:00
|
|
|
int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
|
2005-04-10 04:09:34 +04:00
|
|
|
{
|
2006-04-25 08:18:58 +04:00
|
|
|
int entries, was_valid, newfd;
|
2006-04-24 03:52:35 +04:00
|
|
|
|
2006-06-14 00:21:42 +04:00
|
|
|
/* We can't free this memory, it becomes part of a linked list parsed atexit() */
|
2006-06-20 02:55:20 +04:00
|
|
|
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
|
2005-11-26 11:50:02 +03:00
|
|
|
|
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
When defined, this allows plumbing commands that update the
index (add, apply, checkout-index, merge-recursive, mv,
read-tree, rm, update-index, and write-tree) to write their
resulting index to an alternative index file while holding a
lock to the original index file. With this, git-commit that
jumps the index does not have to make an extra copy of the index
file, and more importantly, it can do the update while holding
the lock on the index.
However, I think the interface to let an environment variable
specify the output is a mistake, as shown in the documentation.
If a curious user has the environment variable set to something
other than the file GIT_INDEX_FILE points at, almost everything
will break. This should instead be a command line parameter to
tell these plumbing commands to write the result in the named
file, to prevent stupid mistakes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-01 10:09:02 +04:00
|
|
|
newfd = hold_locked_index(lock_file, 1);
|
2005-04-10 04:09:34 +04:00
|
|
|
|
2006-06-14 00:21:42 +04:00
|
|
|
entries = read_cache();
|
2005-05-08 18:15:59 +04:00
|
|
|
if (entries < 0)
|
2005-05-19 15:17:16 +04:00
|
|
|
die("git-write-tree: error reading cache");
|
2005-04-16 09:04:54 +04:00
|
|
|
|
2006-04-25 08:18:58 +04:00
|
|
|
if (!active_cache_tree)
|
|
|
|
active_cache_tree = cache_tree();
|
|
|
|
|
|
|
|
was_valid = cache_tree_fully_valid(active_cache_tree);
|
2006-06-14 00:21:42 +04:00
|
|
|
|
2006-04-25 08:18:58 +04:00
|
|
|
if (!was_valid) {
|
|
|
|
if (cache_tree_update(active_cache_tree,
|
|
|
|
active_cache, active_nr,
|
2006-04-28 03:21:54 +04:00
|
|
|
missing_ok, 0) < 0)
|
2006-04-25 08:18:58 +04:00
|
|
|
die("git-write-tree: error building trees");
|
|
|
|
if (0 <= newfd) {
|
2006-07-08 12:56:28 +04:00
|
|
|
if (!write_cache(newfd, active_cache, active_nr)
|
2007-04-26 02:28:17 +04:00
|
|
|
&& !close(newfd)) {
|
2006-06-14 00:21:42 +04:00
|
|
|
commit_lock_file(lock_file);
|
2007-04-26 02:28:17 +04:00
|
|
|
newfd = -1;
|
|
|
|
}
|
2006-04-25 08:18:58 +04:00
|
|
|
}
|
|
|
|
/* Not being able to write is fine -- we are only interested
|
|
|
|
* in updating the cache-tree part, and if the next caller
|
|
|
|
* ends up using the old index with unupdated cache-tree part
|
|
|
|
* it misses the work we did here, but that is just a
|
|
|
|
* performance penalty and not a big deal.
|
|
|
|
*/
|
|
|
|
}
|
2006-06-14 00:21:42 +04:00
|
|
|
|
2006-04-26 12:20:50 +04:00
|
|
|
if (prefix) {
|
|
|
|
struct cache_tree *subtree =
|
|
|
|
cache_tree_find(active_cache_tree, prefix);
|
2007-07-26 07:14:54 +04:00
|
|
|
if (!subtree)
|
|
|
|
die("git-write-tree: prefix %s not found", prefix);
|
2006-08-23 10:49:00 +04:00
|
|
|
hashcpy(sha1, subtree->sha1);
|
2006-04-26 12:20:50 +04:00
|
|
|
}
|
|
|
|
else
|
2006-08-23 10:49:00 +04:00
|
|
|
hashcpy(sha1, active_cache_tree->sha1);
|
2006-06-14 00:21:42 +04:00
|
|
|
|
2007-04-26 02:28:17 +04:00
|
|
|
if (0 <= newfd)
|
|
|
|
close(newfd);
|
2006-06-14 00:21:42 +04:00
|
|
|
rollback_lock_file(lock_file);
|
|
|
|
|
2005-04-08 02:13:13 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2006-06-14 00:21:42 +04:00
|
|
|
|
2006-07-29 09:44:25 +04:00
|
|
|
int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
|
2006-06-14 00:21:42 +04:00
|
|
|
{
|
|
|
|
int missing_ok = 0, ret;
|
|
|
|
const char *prefix = NULL;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
Fix racy-git handling in git-write-tree.
After git-write-tree finishes computing the tree, it updates the
index so that later operations can take advantage of fully
populated cache tree.
However, anybody writing the index file has to mark the entries
that are racily clean. For each entry whose cached lstat(3)
data in the index exactly matches what is obtained from the
filesystem, if the timestamp on the index file was the same or
older than the modification timestamp of the file, the blob
contents and the work tree file, after convert_to_git(), need to
be compared, and if they are different, its index entry needs to
be marked not to match the lstat(3) data from the filesystem.
In order for this to work, convert_to_git() needs to work
correctly, which in turn means you need to read the config file
to get the settings of core.crlf and friends.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-23 21:18:54 +04:00
|
|
|
git_config(git_default_config);
|
2006-06-14 00:21:42 +04:00
|
|
|
while (1 < argc) {
|
|
|
|
const char *arg = argv[1];
|
|
|
|
if (!strcmp(arg, "--missing-ok"))
|
|
|
|
missing_ok = 1;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 12:53:29 +03:00
|
|
|
else if (!prefixcmp(arg, "--prefix="))
|
2006-06-14 00:21:42 +04:00
|
|
|
prefix = arg + 9;
|
|
|
|
else
|
2006-08-03 19:48:41 +04:00
|
|
|
usage(write_tree_usage);
|
2006-06-14 00:21:42 +04:00
|
|
|
argc--; argv++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 2)
|
|
|
|
die("too many options");
|
|
|
|
|
|
|
|
ret = write_tree(sha1, missing_ok, prefix);
|
|
|
|
printf("%s\n", sha1_to_hex(sha1));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|