2005-04-07 22:16:10 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-07 22:13:13 +00:00
|
|
|
#include "cache.h"
|
2005-10-16 07:39:07 +00:00
|
|
|
#include "quote.h"
|
2006-04-24 07:23:54 +00:00
|
|
|
#include "cache-tree.h"
|
2006-04-20 06:52:05 +00:00
|
|
|
#include "tree-walk.h"
|
2006-06-13 20:21:57 +00:00
|
|
|
#include "builtin.h"
|
2007-04-12 19:29:40 +00:00
|
|
|
#include "refs.h"
|
2009-12-25 18:31:26 +00:00
|
|
|
#include "resolve-undo.h"
|
2010-12-01 23:34:06 +00:00
|
|
|
#include "parse-options.h"
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-10 18:32:54 +00:00
|
|
|
/*
|
|
|
|
* Default to not allowing changes to the list of files. The
|
|
|
|
* tool doesn't actually care, but this makes it harder to add
|
|
|
|
* files to the revision control by mistake by doing something
|
2008-09-13 17:18:36 +00:00
|
|
|
* like "git update-index *" and suddenly having all the object
|
2005-04-10 18:32:54 +00:00
|
|
|
* files be revision controlled.
|
|
|
|
*/
|
2005-10-15 04:56:46 +00:00
|
|
|
static int allow_add;
|
|
|
|
static int allow_remove;
|
|
|
|
static int allow_replace;
|
|
|
|
static int info_only;
|
2005-05-31 16:52:43 +00:00
|
|
|
static int force_remove;
|
2005-10-15 04:56:46 +00:00
|
|
|
static int verbose;
|
2006-08-15 17:23:48 +00:00
|
|
|
static int mark_valid_only;
|
2009-08-20 13:46:57 +00:00
|
|
|
static int mark_skip_worktree_only;
|
2009-08-20 13:46:55 +00:00
|
|
|
#define MARK_FLAG 1
|
|
|
|
#define UNMARK_FLAG 2
|
2006-02-09 05:15:24 +00:00
|
|
|
|
2009-11-14 21:33:13 +00:00
|
|
|
__attribute__((format (printf, 1, 2)))
|
2005-10-15 04:56:46 +00:00
|
|
|
static void report(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list vp;
|
|
|
|
|
|
|
|
if (!verbose)
|
|
|
|
return;
|
|
|
|
|
|
|
|
va_start(vp, fmt);
|
|
|
|
vprintf(fmt, vp);
|
|
|
|
putchar('\n');
|
|
|
|
va_end(vp);
|
|
|
|
}
|
|
|
|
|
2009-08-20 13:46:55 +00:00
|
|
|
static int mark_ce_flags(const char *path, int flag, int mark)
|
2006-02-09 05:15:24 +00:00
|
|
|
{
|
|
|
|
int namelen = strlen(path);
|
|
|
|
int pos = cache_name_pos(path, namelen);
|
|
|
|
if (0 <= pos) {
|
2009-08-20 13:46:55 +00:00
|
|
|
if (mark)
|
|
|
|
active_cache[pos]->ce_flags |= flag;
|
|
|
|
else
|
|
|
|
active_cache[pos]->ce_flags &= ~flag;
|
2006-04-24 07:23:54 +00:00
|
|
|
cache_tree_invalidate_path(active_cache_tree, path);
|
2006-02-09 05:15:24 +00:00
|
|
|
active_cache_changed = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-04-12 19:29:40 +00:00
|
|
|
static int remove_one_path(const char *path)
|
2005-04-07 22:13:13 +00:00
|
|
|
{
|
2007-04-12 19:29:40 +00:00
|
|
|
if (!allow_remove)
|
|
|
|
return error("%s: does not exist and --remove not passed", path);
|
|
|
|
if (remove_file_from_cache(path))
|
|
|
|
return error("%s: cannot remove from the index", path);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-04-24 07:23:54 +00:00
|
|
|
|
2007-04-12 19:29:40 +00:00
|
|
|
/*
|
|
|
|
* Handle a path that couldn't be lstat'ed. It's either:
|
|
|
|
* - missing file (ENOENT or ENOTDIR). That's ok if we're
|
|
|
|
* supposed to be removing it and the removal actually
|
|
|
|
* succeeds.
|
|
|
|
* - permission error. That's never ok.
|
|
|
|
*/
|
|
|
|
static int process_lstat_error(const char *path, int err)
|
|
|
|
{
|
|
|
|
if (err == ENOENT || err == ENOTDIR)
|
|
|
|
return remove_one_path(path);
|
|
|
|
return error("lstat(\"%s\"): %s", path, strerror(errno));
|
|
|
|
}
|
2006-04-24 07:23:54 +00:00
|
|
|
|
2007-04-12 19:29:40 +00:00
|
|
|
static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
|
|
|
|
{
|
2007-08-10 16:51:58 +00:00
|
|
|
int option, size;
|
|
|
|
struct cache_entry *ce;
|
2005-10-12 01:45:33 +00:00
|
|
|
|
2007-08-10 16:51:58 +00:00
|
|
|
/* Was the old index entry already up-to-date? */
|
|
|
|
if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
size = cache_entry_size(len);
|
|
|
|
ce = xcalloc(1, size);
|
2007-04-12 19:29:40 +00:00
|
|
|
memcpy(ce->name, path, len);
|
2012-07-11 09:22:37 +00:00
|
|
|
ce->ce_flags = create_ce_flags(0);
|
|
|
|
ce->ce_namelen = len;
|
2007-04-12 19:29:40 +00:00
|
|
|
fill_stat_cache_info(ce, st);
|
|
|
|
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
|
2005-10-07 10:42:00 +00:00
|
|
|
|
2011-05-08 08:47:33 +00:00
|
|
|
if (index_path(ce->sha1, path, st,
|
2011-06-20 07:40:06 +00:00
|
|
|
info_only ? 0 : HASH_WRITE_OBJECT)) {
|
|
|
|
free(ce);
|
2005-10-07 10:42:00 +00:00
|
|
|
return -1;
|
2011-06-20 07:40:06 +00:00
|
|
|
}
|
2005-05-08 04:55:21 +00:00
|
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
2005-09-18 19:09:22 +00:00
|
|
|
if (add_cache_entry(ce, option))
|
2007-04-12 19:29:40 +00:00
|
|
|
return error("%s: cannot add to the index - missing --add option?", path);
|
2005-09-18 19:09:22 +00:00
|
|
|
return 0;
|
2005-04-10 18:32:54 +00:00
|
|
|
}
|
|
|
|
|
2007-04-12 19:29:40 +00:00
|
|
|
/*
|
|
|
|
* Handle a path that was a directory. Four cases:
|
|
|
|
*
|
|
|
|
* - it's already a gitlink in the index, and we keep it that
|
|
|
|
* way, and update it if we can (if we cannot find the HEAD,
|
|
|
|
* we're going to keep it unchanged in the index!)
|
|
|
|
*
|
|
|
|
* - it's a *file* in the index, in which case it should be
|
|
|
|
* removed as a file if removal is allowed, since it doesn't
|
|
|
|
* exist as such any more. If removal isn't allowed, it's
|
|
|
|
* an error.
|
|
|
|
*
|
|
|
|
* (NOTE! This is old and arguably fairly strange behaviour.
|
|
|
|
* We might want to make this an error unconditionally, and
|
|
|
|
* use "--force-remove" if you actually want to force removal).
|
|
|
|
*
|
|
|
|
* - it used to exist as a subdirectory (ie multiple files with
|
|
|
|
* this particular prefix) in the index, in which case it's wrong
|
|
|
|
* to try to update it as a directory.
|
|
|
|
*
|
|
|
|
* - it doesn't exist at all in the index, but it is a valid
|
|
|
|
* git directory, and it should be *added* as a gitlink.
|
|
|
|
*/
|
|
|
|
static int process_directory(const char *path, int len, struct stat *st)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
int pos = cache_name_pos(path, len);
|
|
|
|
|
|
|
|
/* Exact match: file or existing gitlink */
|
|
|
|
if (pos >= 0) {
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
2008-01-15 00:03:17 +00:00
|
|
|
if (S_ISGITLINK(ce->ce_mode)) {
|
2007-04-12 19:29:40 +00:00
|
|
|
|
|
|
|
/* Do nothing to the index if there is no HEAD! */
|
|
|
|
if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return add_one_path(ce, path, len, st);
|
|
|
|
}
|
|
|
|
/* Should this be an unconditional error? */
|
|
|
|
return remove_one_path(path);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Inexact match: is there perhaps a subdirectory match? */
|
|
|
|
pos = -pos-1;
|
|
|
|
while (pos < active_nr) {
|
|
|
|
struct cache_entry *ce = active_cache[pos++];
|
|
|
|
|
|
|
|
if (strncmp(ce->name, path, len))
|
|
|
|
break;
|
|
|
|
if (ce->name[len] > '/')
|
|
|
|
break;
|
|
|
|
if (ce->name[len] < '/')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Subdirectory match - error out */
|
|
|
|
return error("%s: is a directory - add individual files instead", path);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No match - should we add it as a gitlink? */
|
|
|
|
if (!resolve_gitlink_ref(path, "HEAD", sha1))
|
|
|
|
return add_one_path(NULL, path, len, st);
|
|
|
|
|
|
|
|
/* Error out. */
|
|
|
|
return error("%s: is a directory - add files inside instead", path);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int process_path(const char *path)
|
|
|
|
{
|
2009-08-20 13:46:58 +00:00
|
|
|
int pos, len;
|
2007-04-12 19:29:40 +00:00
|
|
|
struct stat st;
|
2009-08-20 13:46:58 +00:00
|
|
|
struct cache_entry *ce;
|
2007-04-12 19:29:40 +00:00
|
|
|
|
2008-08-04 07:51:42 +00:00
|
|
|
len = strlen(path);
|
2009-02-09 20:54:06 +00:00
|
|
|
if (has_symlink_leading_path(path, len))
|
2008-08-04 07:51:42 +00:00
|
|
|
return error("'%s' is beyond a symbolic link", path);
|
|
|
|
|
2009-08-20 13:46:58 +00:00
|
|
|
pos = cache_name_pos(path, len);
|
|
|
|
ce = pos < 0 ? NULL : active_cache[pos];
|
|
|
|
if (ce && ce_skip_worktree(ce)) {
|
|
|
|
/*
|
|
|
|
* working directory version is assumed "good"
|
|
|
|
* so updating it does not make sense.
|
|
|
|
* On the other hand, removing it from index should work
|
|
|
|
*/
|
|
|
|
if (allow_remove && remove_file_from_cache(path))
|
|
|
|
return error("%s: cannot remove from the index", path);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-04-12 19:29:40 +00:00
|
|
|
/*
|
|
|
|
* First things first: get the stat information, to decide
|
|
|
|
* what to do about the pathname!
|
|
|
|
*/
|
|
|
|
if (lstat(path, &st) < 0)
|
|
|
|
return process_lstat_error(path, errno);
|
|
|
|
|
|
|
|
if (S_ISDIR(st.st_mode))
|
|
|
|
return process_directory(path, len, &st);
|
|
|
|
|
2009-08-20 13:46:58 +00:00
|
|
|
return add_one_path(ce, path, len, &st);
|
2007-04-12 19:29:40 +00:00
|
|
|
}
|
|
|
|
|
2005-12-07 09:45:38 +00:00
|
|
|
static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
|
|
|
|
const char *path, int stage)
|
2005-04-15 18:08:33 +00:00
|
|
|
{
|
2005-05-08 04:55:21 +00:00
|
|
|
int size, len, option;
|
2005-04-15 18:08:33 +00:00
|
|
|
struct cache_entry *ce;
|
|
|
|
|
2005-12-07 09:45:38 +00:00
|
|
|
if (!verify_path(path))
|
2008-10-11 16:39:37 +00:00
|
|
|
return error("Invalid path '%s'", path);
|
2005-04-15 18:08:33 +00:00
|
|
|
|
2005-12-07 09:45:38 +00:00
|
|
|
len = strlen(path);
|
2005-04-15 18:08:33 +00:00
|
|
|
size = cache_entry_size(len);
|
2006-04-03 18:30:46 +00:00
|
|
|
ce = xcalloc(1, size);
|
2005-04-15 18:08:33 +00:00
|
|
|
|
2006-08-23 06:49:00 +00:00
|
|
|
hashcpy(ce->sha1, sha1);
|
2005-12-07 09:45:38 +00:00
|
|
|
memcpy(ce->name, path, len);
|
2012-07-11 09:22:37 +00:00
|
|
|
ce->ce_flags = create_ce_flags(stage);
|
|
|
|
ce->ce_namelen = len;
|
2005-04-17 05:26:31 +00:00
|
|
|
ce->ce_mode = create_ce_mode(mode);
|
2006-02-09 05:15:24 +00:00
|
|
|
if (assume_unchanged)
|
2008-01-15 00:03:17 +00:00
|
|
|
ce->ce_flags |= CE_VALID;
|
2005-05-08 04:55:21 +00:00
|
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
2005-10-15 04:56:46 +00:00
|
|
|
if (add_cache_entry(ce, option))
|
|
|
|
return error("%s: cannot add to the index - missing --add option?",
|
2005-12-07 09:45:38 +00:00
|
|
|
path);
|
|
|
|
report("add '%s'", path);
|
2005-10-15 04:56:46 +00:00
|
|
|
return 0;
|
2005-04-15 18:08:33 +00:00
|
|
|
}
|
|
|
|
|
2006-04-23 07:01:29 +00:00
|
|
|
static void chmod_path(int flip, const char *path)
|
2005-10-12 01:45:33 +00:00
|
|
|
{
|
|
|
|
int pos;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
unsigned int mode;
|
2005-04-26 18:55:42 +00:00
|
|
|
|
2005-10-12 01:45:33 +00:00
|
|
|
pos = cache_name_pos(path, strlen(path));
|
|
|
|
if (pos < 0)
|
2006-04-23 07:01:29 +00:00
|
|
|
goto fail;
|
2005-10-12 01:45:33 +00:00
|
|
|
ce = active_cache[pos];
|
2008-01-15 00:03:17 +00:00
|
|
|
mode = ce->ce_mode;
|
2005-10-12 01:45:33 +00:00
|
|
|
if (!S_ISREG(mode))
|
2006-04-23 07:01:29 +00:00
|
|
|
goto fail;
|
2005-10-12 01:45:33 +00:00
|
|
|
switch (flip) {
|
|
|
|
case '+':
|
2008-01-15 00:03:17 +00:00
|
|
|
ce->ce_mode |= 0111; break;
|
2005-10-12 01:45:33 +00:00
|
|
|
case '-':
|
2008-01-15 00:03:17 +00:00
|
|
|
ce->ce_mode &= ~0111; break;
|
2005-10-12 01:45:33 +00:00
|
|
|
default:
|
2006-04-23 07:01:29 +00:00
|
|
|
goto fail;
|
2005-10-12 01:45:33 +00:00
|
|
|
}
|
2006-04-24 07:23:54 +00:00
|
|
|
cache_tree_invalidate_path(active_cache_tree, path);
|
2005-10-12 01:45:33 +00:00
|
|
|
active_cache_changed = 1;
|
2006-04-23 07:01:29 +00:00
|
|
|
report("chmod %cx '%s'", flip, path);
|
|
|
|
return;
|
|
|
|
fail:
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git update-index: cannot chmod %cx '%s'", flip, path);
|
2005-10-12 01:45:33 +00:00
|
|
|
}
|
|
|
|
|
2005-09-27 01:13:08 +00:00
|
|
|
static void update_one(const char *path, const char *prefix, int prefix_length)
|
|
|
|
{
|
|
|
|
const char *p = prefix_path(prefix, prefix_length, path);
|
|
|
|
if (!verify_path(p)) {
|
|
|
|
fprintf(stderr, "Ignoring path %s\n", path);
|
2006-05-06 05:53:56 +00:00
|
|
|
goto free_return;
|
2005-09-27 01:13:08 +00:00
|
|
|
}
|
2006-02-09 05:15:24 +00:00
|
|
|
if (mark_valid_only) {
|
2009-08-20 13:46:55 +00:00
|
|
|
if (mark_ce_flags(p, CE_VALID, mark_valid_only == MARK_FLAG))
|
2006-02-09 05:15:24 +00:00
|
|
|
die("Unable to mark file %s", path);
|
2006-05-06 05:53:56 +00:00
|
|
|
goto free_return;
|
2006-02-09 05:15:24 +00:00
|
|
|
}
|
2009-08-20 13:46:57 +00:00
|
|
|
if (mark_skip_worktree_only) {
|
|
|
|
if (mark_ce_flags(p, CE_SKIP_WORKTREE, mark_skip_worktree_only == MARK_FLAG))
|
2006-02-09 05:15:24 +00:00
|
|
|
die("Unable to mark file %s", path);
|
2006-05-06 05:53:56 +00:00
|
|
|
goto free_return;
|
2006-02-09 05:15:24 +00:00
|
|
|
}
|
|
|
|
|
2005-09-27 01:13:08 +00:00
|
|
|
if (force_remove) {
|
|
|
|
if (remove_file_from_cache(p))
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git update-index: unable to remove %s", path);
|
2005-10-15 04:56:46 +00:00
|
|
|
report("remove '%s'", path);
|
2006-05-06 05:53:56 +00:00
|
|
|
goto free_return;
|
2005-09-27 01:13:08 +00:00
|
|
|
}
|
2007-04-12 19:29:40 +00:00
|
|
|
if (process_path(p))
|
|
|
|
die("Unable to process path %s", path);
|
2005-10-15 04:56:46 +00:00
|
|
|
report("add '%s'", path);
|
2006-05-06 05:53:56 +00:00
|
|
|
free_return:
|
2006-05-06 22:02:53 +00:00
|
|
|
if (p < path || p > path + strlen(path))
|
2009-05-01 09:06:36 +00:00
|
|
|
free((char *)p);
|
2005-09-27 01:13:08 +00:00
|
|
|
}
|
|
|
|
|
2005-10-07 10:42:00 +00:00
|
|
|
static void read_index_info(int line_termination)
|
|
|
|
{
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct strbuf uq = STRBUF_INIT;
|
2007-09-19 22:42:14 +00:00
|
|
|
|
|
|
|
while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
|
2005-11-22 05:46:57 +00:00
|
|
|
char *ptr, *tab;
|
2005-10-16 07:39:07 +00:00
|
|
|
char *path_name;
|
2005-10-07 10:42:00 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
unsigned int mode;
|
2007-04-09 23:01:44 +00:00
|
|
|
unsigned long ul;
|
2005-12-07 09:45:38 +00:00
|
|
|
int stage;
|
|
|
|
|
|
|
|
/* This reads lines formatted in one of three formats:
|
|
|
|
*
|
|
|
|
* (1) mode SP sha1 TAB path
|
2008-09-13 17:18:36 +00:00
|
|
|
* The first format is what "git apply --index-info"
|
2005-12-07 09:45:38 +00:00
|
|
|
* reports, and used to reconstruct a partial tree
|
|
|
|
* that is used for phony merge base tree when falling
|
|
|
|
* back on 3-way merge.
|
|
|
|
*
|
|
|
|
* (2) mode SP type SP sha1 TAB path
|
2008-09-13 17:18:36 +00:00
|
|
|
* The second format is to stuff "git ls-tree" output
|
2005-12-07 09:45:38 +00:00
|
|
|
* into the index file.
|
2006-06-13 20:21:57 +00:00
|
|
|
*
|
2005-12-07 09:45:38 +00:00
|
|
|
* (3) mode SP sha1 SP stage TAB path
|
|
|
|
* This format is to put higher order stages into the
|
2008-09-13 17:18:36 +00:00
|
|
|
* index file and matches "git ls-files --stage" output.
|
2005-12-07 09:45:38 +00:00
|
|
|
*/
|
2007-04-09 23:01:44 +00:00
|
|
|
errno = 0;
|
|
|
|
ul = strtoul(buf.buf, &ptr, 8);
|
|
|
|
if (ptr == buf.buf || *ptr != ' '
|
|
|
|
|| errno || (unsigned int) ul != ul)
|
2005-10-07 10:42:00 +00:00
|
|
|
goto bad_line;
|
2007-04-09 23:01:44 +00:00
|
|
|
mode = ul;
|
2005-10-07 10:42:00 +00:00
|
|
|
|
2005-11-22 05:46:57 +00:00
|
|
|
tab = strchr(ptr, '\t');
|
|
|
|
if (!tab || tab - ptr < 41)
|
|
|
|
goto bad_line;
|
2005-12-07 09:45:38 +00:00
|
|
|
|
2006-02-01 02:03:37 +00:00
|
|
|
if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
|
2005-12-07 09:45:38 +00:00
|
|
|
stage = tab[-1] - '0';
|
|
|
|
ptr = tab + 1; /* point at the head of path */
|
|
|
|
tab = tab - 2; /* point at tail of sha1 */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
stage = 0;
|
|
|
|
ptr = tab + 1; /* point at the head of path */
|
|
|
|
}
|
|
|
|
|
2005-11-22 05:46:57 +00:00
|
|
|
if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
|
|
|
|
goto bad_line;
|
2005-10-16 07:39:07 +00:00
|
|
|
|
2007-09-19 22:42:14 +00:00
|
|
|
path_name = ptr;
|
|
|
|
if (line_termination && path_name[0] == '"') {
|
|
|
|
strbuf_reset(&uq);
|
|
|
|
if (unquote_c_style(&uq, path_name, NULL)) {
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git update-index: bad quoting of path name");
|
2007-09-19 22:42:14 +00:00
|
|
|
}
|
|
|
|
path_name = uq.buf;
|
|
|
|
}
|
2005-10-16 07:39:07 +00:00
|
|
|
|
|
|
|
if (!verify_path(path_name)) {
|
|
|
|
fprintf(stderr, "Ignoring path %s\n", path_name);
|
2005-10-07 10:42:00 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mode) {
|
|
|
|
/* mode == 0 means there is no such path -- remove */
|
2005-10-16 07:39:07 +00:00
|
|
|
if (remove_file_from_cache(path_name))
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git update-index: unable to remove %s",
|
2005-10-07 10:42:00 +00:00
|
|
|
ptr);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* mode ' ' sha1 '\t' name
|
|
|
|
* ptr[-1] points at tab,
|
|
|
|
* ptr[-41] is at the beginning of sha1
|
|
|
|
*/
|
|
|
|
ptr[-42] = ptr[-1] = 0;
|
2005-12-07 09:45:38 +00:00
|
|
|
if (add_cacheinfo(mode, sha1, path_name, stage))
|
2008-08-31 16:39:19 +00:00
|
|
|
die("git update-index: unable to update %s",
|
2005-10-16 07:39:07 +00:00
|
|
|
path_name);
|
2005-10-07 10:42:00 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bad_line:
|
|
|
|
die("malformed index info %s", buf.buf);
|
|
|
|
}
|
2007-09-17 09:19:04 +00:00
|
|
|
strbuf_release(&buf);
|
2007-09-19 22:42:14 +00:00
|
|
|
strbuf_release(&uq);
|
2005-10-07 10:42:00 +00:00
|
|
|
}
|
|
|
|
|
2010-12-01 23:34:06 +00:00
|
|
|
static const char * const update_index_usage[] = {
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("git update-index [options] [--] [<file>...]"),
|
2010-12-01 23:34:06 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-10-25 15:26:25 +00:00
|
|
|
|
2006-04-20 06:52:05 +00:00
|
|
|
static unsigned char head_sha1[20];
|
|
|
|
static unsigned char merge_head_sha1[20];
|
|
|
|
|
|
|
|
static struct cache_entry *read_one_ent(const char *which,
|
|
|
|
unsigned char *ent, const char *path,
|
|
|
|
int namelen, int stage)
|
|
|
|
{
|
|
|
|
unsigned mode;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
int size;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
|
|
|
|
if (get_tree_entry(ent, path, sha1, &mode)) {
|
2006-05-06 00:40:47 +00:00
|
|
|
if (which)
|
|
|
|
error("%s: not in %s branch.", path, which);
|
2006-04-20 06:52:05 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (mode == S_IFDIR) {
|
2006-05-06 00:40:47 +00:00
|
|
|
if (which)
|
|
|
|
error("%s: not a blob in %s branch.", path, which);
|
2006-04-20 06:52:05 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
size = cache_entry_size(namelen);
|
|
|
|
ce = xcalloc(1, size);
|
|
|
|
|
2006-08-23 06:49:00 +00:00
|
|
|
hashcpy(ce->sha1, sha1);
|
2006-04-20 06:52:05 +00:00
|
|
|
memcpy(ce->name, path, namelen);
|
2012-07-11 09:22:37 +00:00
|
|
|
ce->ce_flags = create_ce_flags(stage);
|
|
|
|
ce->ce_namelen = namelen;
|
2006-04-20 06:52:05 +00:00
|
|
|
ce->ce_mode = create_ce_mode(mode);
|
|
|
|
return ce;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unresolve_one(const char *path)
|
|
|
|
{
|
|
|
|
int namelen = strlen(path);
|
|
|
|
int pos;
|
|
|
|
int ret = 0;
|
|
|
|
struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
|
|
|
|
|
|
|
|
/* See if there is such entry in the index. */
|
|
|
|
pos = cache_name_pos(path, namelen);
|
2009-12-25 21:40:02 +00:00
|
|
|
if (0 <= pos) {
|
|
|
|
/* already merged */
|
|
|
|
pos = unmerge_cache_entry_at(pos);
|
|
|
|
if (pos < active_nr) {
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
|
|
|
if (ce_stage(ce) &&
|
|
|
|
ce_namelen(ce) == namelen &&
|
|
|
|
!memcmp(ce->name, path, namelen))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* no resolve-undo information; fall back */
|
|
|
|
} else {
|
2006-04-20 06:52:05 +00:00
|
|
|
/* If there isn't, either it is unmerged, or
|
|
|
|
* resolved as "removed" by mistake. We do not
|
|
|
|
* want to do anything in the former case.
|
|
|
|
*/
|
|
|
|
pos = -pos-1;
|
|
|
|
if (pos < active_nr) {
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
|
|
|
if (ce_namelen(ce) == namelen &&
|
|
|
|
!memcmp(ce->name, path, namelen)) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: skipping still unmerged path.\n",
|
|
|
|
path);
|
|
|
|
goto free_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Grab blobs from given path from HEAD and MERGE_HEAD,
|
|
|
|
* stuff HEAD version in stage #2,
|
|
|
|
* stuff MERGE_HEAD version in stage #3.
|
|
|
|
*/
|
|
|
|
ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
|
|
|
|
ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
|
|
|
|
|
|
|
|
if (!ce_2 || !ce_3) {
|
|
|
|
ret = -1;
|
|
|
|
goto free_return;
|
|
|
|
}
|
2006-08-17 18:54:57 +00:00
|
|
|
if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
|
2006-04-20 06:52:05 +00:00
|
|
|
ce_2->ce_mode == ce_3->ce_mode) {
|
|
|
|
fprintf(stderr, "%s: identical in both, skipping.\n",
|
|
|
|
path);
|
|
|
|
goto free_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
remove_file_from_cache(path);
|
|
|
|
if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
|
|
|
|
error("%s: cannot add our version to the index.", path);
|
|
|
|
ret = -1;
|
|
|
|
goto free_return;
|
|
|
|
}
|
|
|
|
if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
|
|
|
|
return 0;
|
|
|
|
error("%s: cannot add their version to the index.", path);
|
|
|
|
ret = -1;
|
|
|
|
free_return:
|
|
|
|
free(ce_2);
|
|
|
|
free(ce_3);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_head_pointers(void)
|
|
|
|
{
|
2006-09-21 21:29:59 +00:00
|
|
|
if (read_ref("HEAD", head_sha1))
|
2009-01-04 18:38:41 +00:00
|
|
|
die("No HEAD -- no initial commit yet?");
|
2006-09-21 21:29:59 +00:00
|
|
|
if (read_ref("MERGE_HEAD", merge_head_sha1)) {
|
2006-04-20 06:52:05 +00:00
|
|
|
fprintf(stderr, "Not in the middle of a merge.\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-05-06 00:50:06 +00:00
|
|
|
static int do_unresolve(int ac, const char **av,
|
|
|
|
const char *prefix, int prefix_length)
|
2006-04-20 06:52:05 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
/* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
|
|
|
|
* are not doing a merge, so exit with success status.
|
|
|
|
*/
|
|
|
|
read_head_pointers();
|
|
|
|
|
|
|
|
for (i = 1; i < ac; i++) {
|
|
|
|
const char *arg = av[i];
|
2006-05-06 00:50:06 +00:00
|
|
|
const char *p = prefix_path(prefix, prefix_length, arg);
|
|
|
|
err |= unresolve_one(p);
|
2006-05-06 22:02:53 +00:00
|
|
|
if (p < arg || p > arg + strlen(arg))
|
2009-05-01 09:06:36 +00:00
|
|
|
free((char *)p);
|
2006-04-20 06:52:05 +00:00
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2006-05-06 00:40:47 +00:00
|
|
|
static int do_reupdate(int ac, const char **av,
|
|
|
|
const char *prefix, int prefix_length)
|
|
|
|
{
|
|
|
|
/* Read HEAD and run update-index on paths that are
|
|
|
|
* merged and already different between index and HEAD.
|
|
|
|
*/
|
|
|
|
int pos;
|
|
|
|
int has_head = 1;
|
2010-12-17 12:43:07 +00:00
|
|
|
const char **paths = get_pathspec(prefix, av + 1);
|
|
|
|
struct pathspec pathspec;
|
|
|
|
|
|
|
|
init_pathspec(&pathspec, paths);
|
2006-05-06 00:40:47 +00:00
|
|
|
|
2006-09-21 21:29:59 +00:00
|
|
|
if (read_ref("HEAD", head_sha1))
|
2006-05-06 00:40:47 +00:00
|
|
|
/* If there is no HEAD, that means it is an initial
|
|
|
|
* commit. Update everything in the index.
|
|
|
|
*/
|
|
|
|
has_head = 0;
|
|
|
|
redo:
|
|
|
|
for (pos = 0; pos < active_nr; pos++) {
|
|
|
|
struct cache_entry *ce = active_cache[pos];
|
|
|
|
struct cache_entry *old = NULL;
|
|
|
|
int save_nr;
|
2006-05-06 06:09:05 +00:00
|
|
|
|
2010-12-17 12:43:07 +00:00
|
|
|
if (ce_stage(ce) || !ce_path_match(ce, &pathspec))
|
2006-05-06 00:40:47 +00:00
|
|
|
continue;
|
|
|
|
if (has_head)
|
|
|
|
old = read_one_ent(NULL, head_sha1,
|
|
|
|
ce->name, ce_namelen(ce), 0);
|
|
|
|
if (old && ce->ce_mode == old->ce_mode &&
|
2006-08-17 18:54:57 +00:00
|
|
|
!hashcmp(ce->sha1, old->sha1)) {
|
2006-05-06 00:40:47 +00:00
|
|
|
free(old);
|
|
|
|
continue; /* unchanged */
|
|
|
|
}
|
|
|
|
/* Be careful. The working tree may not have the
|
|
|
|
* path anymore, in which case, under 'allow_remove',
|
|
|
|
* or worse yet 'allow_replace', active_nr may decrease.
|
|
|
|
*/
|
|
|
|
save_nr = active_nr;
|
|
|
|
update_one(ce->name + prefix_length, prefix, prefix_length);
|
|
|
|
if (save_nr != active_nr)
|
|
|
|
goto redo;
|
|
|
|
}
|
2010-12-17 12:43:07 +00:00
|
|
|
free_pathspec(&pathspec);
|
2006-05-06 00:40:47 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-01 23:34:06 +00:00
|
|
|
struct refresh_params {
|
|
|
|
unsigned int flags;
|
|
|
|
int *has_errors;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int refresh(struct refresh_params *o, unsigned int flag)
|
|
|
|
{
|
|
|
|
setup_work_tree();
|
2012-10-30 09:50:42 +00:00
|
|
|
read_cache_preload(NULL);
|
2010-12-01 23:34:06 +00:00
|
|
|
*o->has_errors |= refresh_cache(o->flags | flag);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int refresh_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
return refresh(opt->value, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int really_refresh_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
return refresh(opt->value, REFRESH_REALLY);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int chmod_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
char *flip = opt->value;
|
|
|
|
if ((arg[0] != '-' && arg[0] != '+') || arg[1] != 'x' || arg[2])
|
|
|
|
return error("option 'chmod' expects \"+x\" or \"-x\"");
|
|
|
|
*flip = arg[0];
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int resolve_undo_clear_callback(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
resolve_undo_clear();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cacheinfo_callback(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *opt, int unset)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
unsigned int mode;
|
|
|
|
|
|
|
|
if (ctx->argc <= 3)
|
|
|
|
return error("option 'cacheinfo' expects three arguments");
|
|
|
|
if (strtoul_ui(*++ctx->argv, 8, &mode) ||
|
|
|
|
get_sha1_hex(*++ctx->argv, sha1) ||
|
|
|
|
add_cacheinfo(mode, sha1, *++ctx->argv, 0))
|
|
|
|
die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
|
|
|
|
ctx->argc -= 3;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int stdin_cacheinfo_callback(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *opt, int unset)
|
|
|
|
{
|
|
|
|
int *line_termination = opt->value;
|
|
|
|
|
|
|
|
if (ctx->argc != 1)
|
|
|
|
return error("option '%s' must be the last argument", opt->long_name);
|
|
|
|
allow_add = allow_replace = allow_remove = 1;
|
|
|
|
read_index_info(*line_termination);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int stdin_callback(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *opt, int unset)
|
|
|
|
{
|
|
|
|
int *read_from_stdin = opt->value;
|
|
|
|
|
|
|
|
if (ctx->argc != 1)
|
|
|
|
return error("option '%s' must be the last argument", opt->long_name);
|
|
|
|
*read_from_stdin = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unresolve_callback(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *opt, int flags)
|
|
|
|
{
|
|
|
|
int *has_errors = opt->value;
|
|
|
|
const char *prefix = startup_info->prefix;
|
|
|
|
|
|
|
|
/* consume remaining arguments. */
|
|
|
|
*has_errors = do_unresolve(ctx->argc, ctx->argv,
|
|
|
|
prefix, prefix ? strlen(prefix) : 0);
|
|
|
|
if (*has_errors)
|
|
|
|
active_cache_changed = 0;
|
|
|
|
|
|
|
|
ctx->argv += ctx->argc - 1;
|
|
|
|
ctx->argc = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int reupdate_callback(struct parse_opt_ctx_t *ctx,
|
|
|
|
const struct option *opt, int flags)
|
|
|
|
{
|
|
|
|
int *has_errors = opt->value;
|
|
|
|
const char *prefix = startup_info->prefix;
|
|
|
|
|
|
|
|
/* consume remaining arguments. */
|
|
|
|
setup_work_tree();
|
|
|
|
*has_errors = do_reupdate(ctx->argc, ctx->argv,
|
|
|
|
prefix, prefix ? strlen(prefix) : 0);
|
|
|
|
if (*has_errors)
|
|
|
|
active_cache_changed = 0;
|
|
|
|
|
|
|
|
ctx->argv += ctx->argc - 1;
|
|
|
|
ctx->argc = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_update_index(int argc, const char **argv, const char *prefix)
|
2005-04-07 22:13:13 +00:00
|
|
|
{
|
2010-12-01 23:34:06 +00:00
|
|
|
int newfd, entries, has_errors = 0, line_termination = '\n';
|
2005-09-27 01:13:08 +00:00
|
|
|
int read_from_stdin = 0;
|
|
|
|
int prefix_length = prefix ? strlen(prefix) : 0;
|
2012-04-04 16:37:02 +00:00
|
|
|
int preferred_index_format = 0;
|
2006-04-23 07:01:29 +00:00
|
|
|
char set_executable_bit = 0;
|
2010-12-01 23:34:06 +00:00
|
|
|
struct refresh_params refresh_args = {0, &has_errors};
|
2007-02-22 08:30:45 +00:00
|
|
|
int lock_error = 0;
|
2006-06-13 20:21:57 +00:00
|
|
|
struct lock_file *lock_file;
|
2010-12-01 23:34:06 +00:00
|
|
|
struct parse_opt_ctx_t ctx;
|
|
|
|
int parseopt_state = PARSE_OPT_UNKNOWN;
|
|
|
|
struct option options[] = {
|
|
|
|
OPT_BIT('q', NULL, &refresh_args.flags,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("continue refresh even when index needs update"),
|
2010-12-01 23:34:06 +00:00
|
|
|
REFRESH_QUIET),
|
|
|
|
OPT_BIT(0, "ignore-submodules", &refresh_args.flags,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("refresh: ignore submodules"),
|
2010-12-01 23:34:06 +00:00
|
|
|
REFRESH_IGNORE_SUBMODULES),
|
|
|
|
OPT_SET_INT(0, "add", &allow_add,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("do not ignore new files"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_SET_INT(0, "replace", &allow_replace,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("let files replace directories and vice-versa"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_SET_INT(0, "remove", &allow_remove,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("notice files missing from worktree"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_BIT(0, "unmerged", &refresh_args.flags,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("refresh even if index contains unmerged entries"),
|
2010-12-01 23:34:06 +00:00
|
|
|
REFRESH_UNMERGED),
|
|
|
|
{OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("refresh stat information"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
|
|
|
|
refresh_callback},
|
|
|
|
{OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("like --refresh, but ignore assume-unchanged setting"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
|
|
|
|
really_refresh_callback},
|
|
|
|
{OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("<mode> <object> <path>"),
|
|
|
|
N_("add the specified entry to the index"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | /* disallow --cacheinfo=<mode> form */
|
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
|
|
|
|
(parse_opt_cb *) cacheinfo_callback},
|
2012-08-20 12:32:48 +00:00
|
|
|
{OPTION_CALLBACK, 0, "chmod", &set_executable_bit, N_("(+/-)x"),
|
|
|
|
N_("override the executable bit of the listed files"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
|
|
|
|
chmod_callback},
|
|
|
|
{OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("mark files as \"not changing\""),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
|
|
|
|
{OPTION_SET_INT, 0, "no-assume-unchanged", &mark_valid_only, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("clear assumed-unchanged bit"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
|
|
|
|
{OPTION_SET_INT, 0, "skip-worktree", &mark_skip_worktree_only, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("mark files as \"index-only\""),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
|
|
|
|
{OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("clear skip-worktree bit"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
|
|
|
|
OPT_SET_INT(0, "info-only", &info_only,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("add to index only; do not add content to object database"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_SET_INT(0, "force-remove", &force_remove,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("remove named paths even if present in worktree"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_SET_INT('z', NULL, &line_termination,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("with --stdin: input lines are terminated by null bytes"), '\0'),
|
2010-12-01 23:34:06 +00:00
|
|
|
{OPTION_LOWLEVEL_CALLBACK, 0, "stdin", &read_from_stdin, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("read list of paths to be updated from standard input"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
|
|
|
|
(parse_opt_cb *) stdin_callback},
|
|
|
|
{OPTION_LOWLEVEL_CALLBACK, 0, "index-info", &line_termination, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("add entries from standard input to the index"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
|
|
|
|
(parse_opt_cb *) stdin_cacheinfo_callback},
|
|
|
|
{OPTION_LOWLEVEL_CALLBACK, 0, "unresolve", &has_errors, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("repopulate stages #2 and #3 for the listed paths"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
|
|
|
|
(parse_opt_cb *) unresolve_callback},
|
|
|
|
{OPTION_LOWLEVEL_CALLBACK, 'g', "again", &has_errors, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("only update entries that differ from HEAD"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_NOARG,
|
|
|
|
(parse_opt_cb *) reupdate_callback},
|
|
|
|
OPT_BIT(0, "ignore-missing", &refresh_args.flags,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("ignore files missing from worktree"),
|
2010-12-01 23:34:06 +00:00
|
|
|
REFRESH_IGNORE_MISSING),
|
|
|
|
OPT_SET_INT(0, "verbose", &verbose,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("report actions to standard output"), 1),
|
2010-12-01 23:34:06 +00:00
|
|
|
{OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("(for porcelains) forget saved unresolved conflicts"),
|
2010-12-01 23:34:06 +00:00
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
|
|
|
|
resolve_undo_clear_callback},
|
2012-04-04 16:37:02 +00:00
|
|
|
OPT_INTEGER(0, "index-version", &preferred_index_format,
|
2012-08-20 12:32:48 +00:00
|
|
|
N_("write index in this format")),
|
2010-12-01 23:34:06 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2005-04-21 17:55:18 +00:00
|
|
|
|
2010-10-22 06:51:00 +00:00
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
2013-02-23 18:10:41 +00:00
|
|
|
usage_with_options(update_index_usage, options);
|
2010-10-22 06:51:00 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2005-10-12 01:45:33 +00:00
|
|
|
|
2006-06-13 20:21:57 +00:00
|
|
|
/* We can't free this memory, it becomes part of a linked list parsed atexit() */
|
2006-06-19 22:55:20 +00:00
|
|
|
lock_file = xcalloc(1, sizeof(struct lock_file));
|
2006-06-13 20:21:57 +00: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 06:09:02 +00:00
|
|
|
newfd = hold_locked_index(lock_file, 0);
|
2007-02-22 08:30:45 +00:00
|
|
|
if (newfd < 0)
|
|
|
|
lock_error = errno;
|
2005-04-11 22:39:26 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
entries = read_cache();
|
2005-04-11 22:39:26 +00:00
|
|
|
if (entries < 0)
|
2005-04-13 09:28:48 +00:00
|
|
|
die("cache corrupted");
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2010-12-01 23:34:06 +00:00
|
|
|
/*
|
|
|
|
* Custom copy of parse_options() because we want to handle
|
|
|
|
* filename arguments as they come.
|
|
|
|
*/
|
|
|
|
parse_options_start(&ctx, argc, argv, prefix,
|
|
|
|
options, PARSE_OPT_STOP_AT_NON_OPTION);
|
|
|
|
while (ctx.argc) {
|
|
|
|
if (parseopt_state != PARSE_OPT_DONE)
|
|
|
|
parseopt_state = parse_options_step(&ctx, options,
|
|
|
|
update_index_usage);
|
|
|
|
if (!ctx.argc)
|
|
|
|
break;
|
|
|
|
switch (parseopt_state) {
|
|
|
|
case PARSE_OPT_HELP:
|
|
|
|
exit(129);
|
|
|
|
case PARSE_OPT_NON_OPTION:
|
|
|
|
case PARSE_OPT_DONE:
|
|
|
|
{
|
|
|
|
const char *path = ctx.argv[0];
|
|
|
|
const char *p;
|
2005-04-10 18:32:54 +00:00
|
|
|
|
2010-12-01 23:34:06 +00:00
|
|
|
setup_work_tree();
|
|
|
|
p = prefix_path(prefix, prefix_length, path);
|
|
|
|
update_one(p, NULL, 0);
|
|
|
|
if (set_executable_bit)
|
|
|
|
chmod_path(set_executable_bit, p);
|
|
|
|
if (p < path || p > path + strlen(path))
|
|
|
|
free((char *)p);
|
|
|
|
ctx.argc--;
|
|
|
|
ctx.argv++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case PARSE_OPT_UNKNOWN:
|
|
|
|
if (ctx.argv[0][1] == '-')
|
|
|
|
error("unknown option '%s'", ctx.argv[0] + 2);
|
|
|
|
else
|
|
|
|
error("unknown switch '%c'", *ctx.opt);
|
|
|
|
usage_with_options(update_index_usage, options);
|
2005-04-10 18:32:54 +00:00
|
|
|
}
|
2005-09-27 01:13:08 +00:00
|
|
|
}
|
2010-12-01 23:34:06 +00:00
|
|
|
argc = parse_options_end(&ctx);
|
2012-04-04 16:37:02 +00:00
|
|
|
if (preferred_index_format) {
|
|
|
|
if (preferred_index_format < INDEX_FORMAT_LB ||
|
|
|
|
INDEX_FORMAT_UB < preferred_index_format)
|
|
|
|
die("index-version %d not in range: %d..%d",
|
|
|
|
preferred_index_format,
|
|
|
|
INDEX_FORMAT_LB, INDEX_FORMAT_UB);
|
|
|
|
|
|
|
|
if (the_index.version != preferred_index_format)
|
|
|
|
active_cache_changed = 1;
|
|
|
|
the_index.version = preferred_index_format;
|
|
|
|
}
|
2010-12-01 23:34:06 +00:00
|
|
|
|
2005-09-27 01:13:08 +00:00
|
|
|
if (read_from_stdin) {
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
2007-09-19 22:42:14 +00:00
|
|
|
|
2008-08-30 09:13:58 +00:00
|
|
|
setup_work_tree();
|
2007-09-19 22:42:14 +00:00
|
|
|
while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
|
2006-05-06 05:53:56 +00:00
|
|
|
const char *p;
|
2007-09-19 22:42:14 +00:00
|
|
|
if (line_termination && buf.buf[0] == '"') {
|
|
|
|
strbuf_reset(&nbuf);
|
|
|
|
if (unquote_c_style(&nbuf, buf.buf, NULL))
|
|
|
|
die("line is badly quoted");
|
|
|
|
strbuf_swap(&buf, &nbuf);
|
|
|
|
}
|
|
|
|
p = prefix_path(prefix, prefix_length, buf.buf);
|
2006-05-06 05:53:56 +00:00
|
|
|
update_one(p, NULL, 0);
|
|
|
|
if (set_executable_bit)
|
2006-04-23 07:01:29 +00:00
|
|
|
chmod_path(set_executable_bit, p);
|
2007-09-19 22:42:14 +00:00
|
|
|
if (p < buf.buf || p > buf.buf + buf.len)
|
|
|
|
free((char *)p);
|
2005-05-31 16:52:43 +00:00
|
|
|
}
|
2007-09-19 22:42:14 +00:00
|
|
|
strbuf_release(&nbuf);
|
2007-09-17 09:19:04 +00:00
|
|
|
strbuf_release(&buf);
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|
2006-04-20 06:52:05 +00:00
|
|
|
|
2005-10-01 20:39:47 +00:00
|
|
|
if (active_cache_changed) {
|
2007-02-22 08:30:45 +00:00
|
|
|
if (newfd < 0) {
|
2010-12-01 23:34:06 +00:00
|
|
|
if (refresh_args.flags & REFRESH_QUIET)
|
2007-02-22 08:30:45 +00:00
|
|
|
exit(128);
|
2009-02-19 12:54:18 +00:00
|
|
|
unable_to_lock_index_die(get_index_file(), lock_error);
|
2007-02-22 08:30:45 +00:00
|
|
|
}
|
2005-10-01 20:39:47 +00:00
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
2008-01-16 19:12:46 +00:00
|
|
|
commit_locked_index(lock_file))
|
2006-06-06 19:51:49 +00:00
|
|
|
die("Unable to write new index file");
|
2005-10-01 20:39:47 +00:00
|
|
|
}
|
2005-04-11 22:39:26 +00:00
|
|
|
|
2006-06-13 20:21:57 +00:00
|
|
|
rollback_lock_file(lock_file);
|
|
|
|
|
2005-05-05 22:29:06 +00:00
|
|
|
return has_errors ? 1 : 0;
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|