Merge branch 'jc/add-n-u'
* jc/add-n-u: Make git add -n and git -u -n output consistent "git-add -n -u" should not add but just report Conflicts: builtin-add.c builtin-mv.c cache.h read-cache.c
This commit is contained in:
commit
0166592495
@ -100,15 +100,16 @@ static void update_callback(struct diff_queue_struct *q,
|
|||||||
case DIFF_STATUS_UNMERGED:
|
case DIFF_STATUS_UNMERGED:
|
||||||
case DIFF_STATUS_MODIFIED:
|
case DIFF_STATUS_MODIFIED:
|
||||||
case DIFF_STATUS_TYPE_CHANGED:
|
case DIFF_STATUS_TYPE_CHANGED:
|
||||||
if (add_file_to_cache(path, data->flags & ADD_FILES_VERBOSE)) {
|
if (add_file_to_cache(path, data->flags)) {
|
||||||
if (!(data->flags & ADD_FILES_IGNORE_ERRORS))
|
if (!(data->flags & ADD_CACHE_IGNORE_ERRORS))
|
||||||
die("updating files failed");
|
die("updating files failed");
|
||||||
data->add_errors++;
|
data->add_errors++;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DIFF_STATUS_DELETED:
|
case DIFF_STATUS_DELETED:
|
||||||
remove_file_from_cache(path);
|
if (!(data->flags & ADD_CACHE_PRETEND))
|
||||||
if (data->flags & ADD_FILES_VERBOSE)
|
remove_file_from_cache(path);
|
||||||
|
if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE))
|
||||||
printf("remove '%s'\n", path);
|
printf("remove '%s'\n", path);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -221,6 +222,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||||||
int i, newfd;
|
int i, newfd;
|
||||||
const char **pathspec;
|
const char **pathspec;
|
||||||
struct dir_struct dir;
|
struct dir_struct dir;
|
||||||
|
int flags;
|
||||||
|
|
||||||
argc = parse_options(argc, argv, builtin_add_options,
|
argc = parse_options(argc, argv, builtin_add_options,
|
||||||
builtin_add_usage, 0);
|
builtin_add_usage, 0);
|
||||||
@ -233,18 +235,15 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
newfd = hold_locked_index(&lock_file, 1);
|
newfd = hold_locked_index(&lock_file, 1);
|
||||||
|
|
||||||
|
flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
|
||||||
|
(show_only ? ADD_CACHE_PRETEND : 0) |
|
||||||
|
(ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0));
|
||||||
|
|
||||||
if (take_worktree_changes) {
|
if (take_worktree_changes) {
|
||||||
int flags = 0;
|
|
||||||
const char **pathspec;
|
const char **pathspec;
|
||||||
if (read_cache() < 0)
|
if (read_cache() < 0)
|
||||||
die("index file corrupt");
|
die("index file corrupt");
|
||||||
pathspec = get_pathspec(prefix, argv);
|
pathspec = get_pathspec(prefix, argv);
|
||||||
|
|
||||||
if (verbose)
|
|
||||||
flags |= ADD_FILES_VERBOSE;
|
|
||||||
if (ignore_add_errors)
|
|
||||||
flags |= ADD_FILES_IGNORE_ERRORS;
|
|
||||||
|
|
||||||
exit_status = add_files_to_cache(prefix, pathspec, flags);
|
exit_status = add_files_to_cache(prefix, pathspec, flags);
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
@ -263,17 +262,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
fill_directory(&dir, pathspec, ignored_too);
|
fill_directory(&dir, pathspec, ignored_too);
|
||||||
|
|
||||||
if (show_only) {
|
|
||||||
const char *sep = "", *eof = "";
|
|
||||||
for (i = 0; i < dir.nr; i++) {
|
|
||||||
printf("%s%s", sep, dir.entries[i]->name);
|
|
||||||
sep = " ";
|
|
||||||
eof = "\n";
|
|
||||||
}
|
|
||||||
fputs(eof, stdout);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (read_cache() < 0)
|
if (read_cache() < 0)
|
||||||
die("index file corrupt");
|
die("index file corrupt");
|
||||||
|
|
||||||
@ -287,7 +275,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < dir.nr; i++)
|
for (i = 0; i < dir.nr; i++)
|
||||||
if (add_file_to_cache(dir.entries[i]->name, verbose)) {
|
if (add_file_to_cache(dir.entries[i]->name, flags)) {
|
||||||
if (!ignore_add_errors)
|
if (!ignore_add_errors)
|
||||||
die("adding files failed");
|
die("adding files failed");
|
||||||
exit_status = 1;
|
exit_status = 1;
|
||||||
|
@ -256,7 +256,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
for (i = 0; i < added.nr; i++) {
|
for (i = 0; i < added.nr; i++) {
|
||||||
const char *path = added.items[i].path;
|
const char *path = added.items[i].path;
|
||||||
if (add_file_to_cache(path, verbose))
|
if (add_file_to_cache(path, verbose ? ADD_CACHE_VERBOSE : 0))
|
||||||
die("updating index entries failed");
|
die("updating index entries failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
13
cache.h
13
cache.h
@ -261,8 +261,8 @@ static inline void remove_name_hash(struct cache_entry *ce)
|
|||||||
#define add_cache_entry(ce, option) add_index_entry(&the_index, (ce), (option))
|
#define add_cache_entry(ce, option) add_index_entry(&the_index, (ce), (option))
|
||||||
#define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
|
#define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
|
||||||
#define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
|
#define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
|
||||||
#define add_to_cache(path, st, verbose) add_to_index(&the_index, (path), (st), (verbose))
|
#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags))
|
||||||
#define add_file_to_cache(path, verbose) add_file_to_index(&the_index, (path), (verbose))
|
#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
|
||||||
#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL)
|
#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL)
|
||||||
#define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
|
#define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
|
||||||
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
|
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
|
||||||
@ -371,8 +371,11 @@ extern int add_index_entry(struct index_state *, struct cache_entry *ce, int opt
|
|||||||
extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
|
extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
|
||||||
extern int remove_index_entry_at(struct index_state *, int pos);
|
extern int remove_index_entry_at(struct index_state *, int pos);
|
||||||
extern int remove_file_from_index(struct index_state *, const char *path);
|
extern int remove_file_from_index(struct index_state *, const char *path);
|
||||||
extern int add_to_index(struct index_state *, const char *path, struct stat *, int verbose);
|
#define ADD_CACHE_VERBOSE 1
|
||||||
extern int add_file_to_index(struct index_state *, const char *path, int verbose);
|
#define ADD_CACHE_PRETEND 2
|
||||||
|
#define ADD_CACHE_IGNORE_ERRORS 4
|
||||||
|
extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
|
||||||
|
extern int add_file_to_index(struct index_state *, const char *path, int flags);
|
||||||
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
|
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
|
||||||
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
|
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
|
||||||
|
|
||||||
@ -791,8 +794,6 @@ extern int convert_to_git(const char *path, const char *src, size_t len,
|
|||||||
extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
|
extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
|
||||||
|
|
||||||
/* add */
|
/* add */
|
||||||
#define ADD_FILES_VERBOSE 01
|
|
||||||
#define ADD_FILES_IGNORE_ERRORS 02
|
|
||||||
/*
|
/*
|
||||||
* return 0 if success, 1 - if addition of a file failed and
|
* return 0 if success, 1 - if addition of a file failed and
|
||||||
* ADD_FILES_IGNORE_ERRORS was specified in flags
|
* ADD_FILES_IGNORE_ERRORS was specified in flags
|
||||||
|
23
read-cache.c
23
read-cache.c
@ -462,12 +462,14 @@ static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_
|
|||||||
return new;
|
return new;
|
||||||
}
|
}
|
||||||
|
|
||||||
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int verbose)
|
int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
|
||||||
{
|
{
|
||||||
int size, namelen;
|
int size, namelen, was_same;
|
||||||
mode_t st_mode = st->st_mode;
|
mode_t st_mode = st->st_mode;
|
||||||
struct cache_entry *ce, *alias;
|
struct cache_entry *ce, *alias;
|
||||||
unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
|
unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY;
|
||||||
|
int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
|
||||||
|
int pretend = flags & ADD_CACHE_PRETEND;
|
||||||
|
|
||||||
if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
|
if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
|
||||||
return error("%s: can only add regular files, symbolic links or git-directories", path);
|
return error("%s: can only add regular files, symbolic links or git-directories", path);
|
||||||
@ -509,19 +511,28 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
|
|||||||
if (ignore_case && alias && different_name(ce, alias))
|
if (ignore_case && alias && different_name(ce, alias))
|
||||||
ce = create_alias_ce(ce, alias);
|
ce = create_alias_ce(ce, alias);
|
||||||
ce->ce_flags |= CE_ADDED;
|
ce->ce_flags |= CE_ADDED;
|
||||||
if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
|
|
||||||
|
/* It was suspected to be recily clean, but it turns out to be Ok */
|
||||||
|
was_same = (alias &&
|
||||||
|
!ce_stage(alias) &&
|
||||||
|
!hashcmp(alias->sha1, ce->sha1) &&
|
||||||
|
ce->ce_mode == alias->ce_mode);
|
||||||
|
|
||||||
|
if (pretend)
|
||||||
|
;
|
||||||
|
else if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
|
||||||
return error("unable to add %s to index",path);
|
return error("unable to add %s to index",path);
|
||||||
if (verbose)
|
if (verbose && !was_same)
|
||||||
printf("add '%s'\n", path);
|
printf("add '%s'\n", path);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int add_file_to_index(struct index_state *istate, const char *path, int verbose)
|
int add_file_to_index(struct index_state *istate, const char *path, int flags)
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (lstat(path, &st))
|
if (lstat(path, &st))
|
||||||
die("%s: unable to stat (%s)", path, strerror(errno));
|
die("%s: unable to stat (%s)", path, strerror(errno));
|
||||||
return add_to_index(istate, path, &st, verbose);
|
return add_to_index(istate, path, &st, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct cache_entry *make_cache_entry(unsigned int mode,
|
struct cache_entry *make_cache_entry(unsigned int mode,
|
||||||
|
@ -111,4 +111,21 @@ test_expect_success 'touch and then add explicitly' '
|
|||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'add -n -u should not add but just report' '
|
||||||
|
|
||||||
|
(
|
||||||
|
echo "add '\''check'\''" &&
|
||||||
|
echo "remove '\''top'\''"
|
||||||
|
) >expect &&
|
||||||
|
before=$(git ls-files -s check top) &&
|
||||||
|
echo changed >>check &&
|
||||||
|
rm -f top &&
|
||||||
|
git add -n -u >actual &&
|
||||||
|
after=$(git ls-files -s check top) &&
|
||||||
|
|
||||||
|
test "$before" = "$after" &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user