зеркало из https://github.com/microsoft/git.git
Merge branch 'kh/commit' into wc/add-i
This is to use a few functions refactored to use in the built-in commit series. * kh/commit: (28 commits) Add a few more tests for git-commit builtin-commit: Include the diff in the commit message when verbose. builtin-commit: fix partial-commit support Fix add_files_to_cache() to take pathspec, not user specified list of files Export three helper functions from ls-files builtin-commit: run commit-msg hook with correct message file builtin-commit: do not color status output shown in the message template file_exists(): dangling symlinks do exist Replace "runstatus" with "status" in the tests t7501-commit: Add test for git commit <file> with dirty index. builtin-commit: Clean up an unused variable and a debug fprintf(). Call refresh_cache() when updating the user index for --only commits. builtin-commit: Add newline when showing which commit was created builtin-commit: resurrect behavior for multiple -m options builtin-commit --s: add a newline if the last line was not a S-o-b builtin-commit: fix --signoff git status: show relative paths when run in a subdirectory builtin-commit: Refresh cache after adding files. builtin-commit: fix reflog message generation launch_editor(): read the file, even when EDITOR=: ...
This commit is contained in:
Junio C Hamano
Коммит
f64fe7b481
|
|
@ -109,7 +109,6 @@ git-rev-list
|
|||
git-rev-parse
|
||||
git-revert
|
||||
git-rm
|
||||
git-runstatus
|
||||
git-send-email
|
||||
git-send-pack
|
||||
git-sh-setup
|
||||
|
|
|
|||
12
Makefile
12
Makefile
|
|
@ -213,7 +213,7 @@ BASIC_LDFLAGS =
|
|||
|
||||
SCRIPT_SH = \
|
||||
git-bisect.sh git-checkout.sh \
|
||||
git-clean.sh git-clone.sh git-commit.sh \
|
||||
git-clean.sh git-clone.sh \
|
||||
git-ls-remote.sh \
|
||||
git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
|
||||
git-pull.sh git-rebase.sh git-rebase--interactive.sh \
|
||||
|
|
@ -221,7 +221,7 @@ SCRIPT_SH = \
|
|||
git-sh-setup.sh \
|
||||
git-am.sh \
|
||||
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
||||
git-merge-resolve.sh git-merge-ours.sh \
|
||||
git-merge-resolve.sh \
|
||||
git-lost-found.sh git-quiltimport.sh git-submodule.sh \
|
||||
git-filter-branch.sh \
|
||||
git-stash.sh
|
||||
|
|
@ -260,7 +260,7 @@ EXTRA_PROGRAMS =
|
|||
BUILT_INS = \
|
||||
git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
|
||||
git-get-tar-commit-id$X git-init$X git-repo-config$X \
|
||||
git-fsck-objects$X git-cherry-pick$X \
|
||||
git-fsck-objects$X git-cherry-pick$X git-status$X\
|
||||
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
|
||||
|
||||
# what 'all' will build and 'install' will install, in gitexecdir
|
||||
|
|
@ -330,6 +330,7 @@ BUILTIN_OBJS = \
|
|||
builtin-check-attr.o \
|
||||
builtin-checkout-index.o \
|
||||
builtin-check-ref-format.o \
|
||||
builtin-commit.o \
|
||||
builtin-commit-tree.o \
|
||||
builtin-count-objects.o \
|
||||
builtin-describe.o \
|
||||
|
|
@ -353,6 +354,7 @@ BUILTIN_OBJS = \
|
|||
builtin-mailsplit.o \
|
||||
builtin-merge-base.o \
|
||||
builtin-merge-file.o \
|
||||
builtin-merge-ours.o \
|
||||
builtin-mv.o \
|
||||
builtin-name-rev.o \
|
||||
builtin-pack-objects.o \
|
||||
|
|
@ -368,7 +370,6 @@ BUILTIN_OBJS = \
|
|||
builtin-rev-parse.o \
|
||||
builtin-revert.o \
|
||||
builtin-rm.o \
|
||||
builtin-runstatus.o \
|
||||
builtin-shortlog.o \
|
||||
builtin-show-branch.o \
|
||||
builtin-stripspace.o \
|
||||
|
|
@ -837,9 +838,6 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
|||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
|
||||
git-status: git-commit
|
||||
$(QUIET_GEN)cp $< $@+ && mv $@+ $@
|
||||
|
||||
gitweb/gitweb.cgi: gitweb/gitweb.perl
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
||||
|
|
|
|||
|
|
@ -105,12 +105,12 @@ static void update_callback(struct diff_queue_struct *q,
|
|||
}
|
||||
}
|
||||
|
||||
void add_files_to_cache(int verbose, const char *prefix, const char **files)
|
||||
void add_files_to_cache(int verbose, const char *prefix, const char **pathspec)
|
||||
{
|
||||
struct rev_info rev;
|
||||
init_revisions(&rev, prefix);
|
||||
setup_revisions(0, NULL, &rev, NULL);
|
||||
rev.prune_data = get_pathspec(prefix, files);
|
||||
rev.prune_data = pathspec;
|
||||
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
|
||||
rev.diffopt.format_callback = update_callback;
|
||||
rev.diffopt.format_callback_data = &verbose;
|
||||
|
|
@ -183,9 +183,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
|||
newfd = hold_locked_index(&lock_file, 1);
|
||||
|
||||
if (take_worktree_changes) {
|
||||
const char **pathspec;
|
||||
if (read_cache() < 0)
|
||||
die("index file corrupt");
|
||||
add_files_to_cache(verbose, prefix, argv);
|
||||
pathspec = get_pathspec(prefix, argv);
|
||||
add_files_to_cache(verbose, prefix, pathspec);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,814 @@
|
|||
/*
|
||||
* Builtin "git commit"
|
||||
*
|
||||
* Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>
|
||||
* Based on git-commit.sh by Junio C Hamano and Linus Torvalds
|
||||
*/
|
||||
|
||||
#include "cache.h"
|
||||
#include "cache-tree.h"
|
||||
#include "dir.h"
|
||||
#include "builtin.h"
|
||||
#include "diff.h"
|
||||
#include "diffcore.h"
|
||||
#include "commit.h"
|
||||
#include "revision.h"
|
||||
#include "wt-status.h"
|
||||
#include "run-command.h"
|
||||
#include "refs.h"
|
||||
#include "log-tree.h"
|
||||
#include "strbuf.h"
|
||||
#include "utf8.h"
|
||||
#include "parse-options.h"
|
||||
#include "path-list.h"
|
||||
|
||||
static const char * const builtin_commit_usage[] = {
|
||||
"git-commit [options] [--] <filepattern>...",
|
||||
NULL
|
||||
};
|
||||
|
||||
static unsigned char head_sha1[20], merge_head_sha1[20];
|
||||
static char *use_message_buffer;
|
||||
static const char commit_editmsg[] = "COMMIT_EDITMSG";
|
||||
static struct lock_file index_lock; /* real index */
|
||||
static struct lock_file false_lock; /* used only for partial commits */
|
||||
static enum {
|
||||
COMMIT_AS_IS = 1,
|
||||
COMMIT_NORMAL,
|
||||
COMMIT_PARTIAL,
|
||||
} commit_style;
|
||||
|
||||
static char *logfile, *force_author, *template_file;
|
||||
static char *edit_message, *use_message;
|
||||
static int all, edit_flag, also, interactive, only, amend, signoff;
|
||||
static int quiet, verbose, untracked_files, no_verify;
|
||||
|
||||
static int no_edit, initial_commit, in_merge;
|
||||
const char *only_include_assumed;
|
||||
struct strbuf message;
|
||||
|
||||
static int opt_parse_m(const struct option *opt, const char *arg, int unset)
|
||||
{
|
||||
struct strbuf *buf = opt->value;
|
||||
if (unset)
|
||||
strbuf_setlen(buf, 0);
|
||||
else {
|
||||
strbuf_addstr(buf, arg);
|
||||
strbuf_addch(buf, '\n');
|
||||
strbuf_addch(buf, '\n');
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct option builtin_commit_options[] = {
|
||||
OPT__QUIET(&quiet),
|
||||
OPT__VERBOSE(&verbose),
|
||||
OPT_GROUP("Commit message options"),
|
||||
|
||||
OPT_STRING('F', "file", &logfile, "FILE", "read log from file"),
|
||||
OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
|
||||
OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
|
||||
OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
|
||||
OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
|
||||
OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"),
|
||||
OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"),
|
||||
OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
|
||||
|
||||
OPT_GROUP("Commit contents options"),
|
||||
OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
|
||||
OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
|
||||
OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
|
||||
OPT_BOOLEAN('o', "only", &only, ""),
|
||||
OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
|
||||
OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
|
||||
OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"),
|
||||
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
static void rollback_index_files(void)
|
||||
{
|
||||
switch (commit_style) {
|
||||
case COMMIT_AS_IS:
|
||||
break; /* nothing to do */
|
||||
case COMMIT_NORMAL:
|
||||
rollback_lock_file(&index_lock);
|
||||
break;
|
||||
case COMMIT_PARTIAL:
|
||||
rollback_lock_file(&index_lock);
|
||||
rollback_lock_file(&false_lock);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void commit_index_files(void)
|
||||
{
|
||||
switch (commit_style) {
|
||||
case COMMIT_AS_IS:
|
||||
break; /* nothing to do */
|
||||
case COMMIT_NORMAL:
|
||||
commit_lock_file(&index_lock);
|
||||
break;
|
||||
case COMMIT_PARTIAL:
|
||||
commit_lock_file(&index_lock);
|
||||
rollback_lock_file(&false_lock);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Take a union of paths in the index and the named tree (typically, "HEAD"),
|
||||
* and return the paths that match the given pattern in list.
|
||||
*/
|
||||
static int list_paths(struct path_list *list, const char *with_tree,
|
||||
const char *prefix, const char **pattern)
|
||||
{
|
||||
int i;
|
||||
char *m;
|
||||
|
||||
for (i = 0; pattern[i]; i++)
|
||||
;
|
||||
m = xcalloc(1, i);
|
||||
|
||||
if (with_tree)
|
||||
overlay_tree_on_cache(with_tree, prefix);
|
||||
|
||||
for (i = 0; i < active_nr; i++) {
|
||||
struct cache_entry *ce = active_cache[i];
|
||||
if (ce->ce_flags & htons(CE_UPDATE))
|
||||
continue;
|
||||
if (!pathspec_match(pattern, m, ce->name, 0))
|
||||
continue;
|
||||
path_list_insert(ce->name, list);
|
||||
}
|
||||
|
||||
return report_path_error(m, pattern, prefix ? strlen(prefix) : 0);
|
||||
}
|
||||
|
||||
static void add_remove_files(struct path_list *list)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < list->nr; i++) {
|
||||
struct path_list_item *p = &(list->items[i]);
|
||||
if (file_exists(p->path))
|
||||
add_file_to_cache(p->path, 0);
|
||||
else
|
||||
remove_file_from_cache(p->path);
|
||||
}
|
||||
}
|
||||
|
||||
static char *prepare_index(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int fd;
|
||||
struct tree *tree;
|
||||
struct path_list partial;
|
||||
const char **pathspec = NULL;
|
||||
|
||||
if (interactive) {
|
||||
interactive_add(argc, argv);
|
||||
commit_style = COMMIT_AS_IS;
|
||||
return get_index_file();
|
||||
}
|
||||
|
||||
if (read_cache() < 0)
|
||||
die("index file corrupt");
|
||||
|
||||
if (*argv)
|
||||
pathspec = get_pathspec(prefix, argv);
|
||||
|
||||
/*
|
||||
* Non partial, non as-is commit.
|
||||
*
|
||||
* (1) get the real index;
|
||||
* (2) update the_index as necessary;
|
||||
* (3) write the_index out to the real index (still locked);
|
||||
* (4) return the name of the locked index file.
|
||||
*
|
||||
* The caller should run hooks on the locked real index, and
|
||||
* (A) if all goes well, commit the real index;
|
||||
* (B) on failure, rollback the real index.
|
||||
*/
|
||||
if (all || (also && pathspec && *pathspec)) {
|
||||
int fd = hold_locked_index(&index_lock, 1);
|
||||
add_files_to_cache(0, also ? prefix : NULL, pathspec);
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
if (write_cache(fd, active_cache, active_nr) || close(fd))
|
||||
die("unable to write new_index file");
|
||||
commit_style = COMMIT_NORMAL;
|
||||
return index_lock.filename;
|
||||
}
|
||||
|
||||
/*
|
||||
* As-is commit.
|
||||
*
|
||||
* (1) return the name of the real index file.
|
||||
*
|
||||
* The caller should run hooks on the real index, and run
|
||||
* hooks on the real index, and create commit from the_index.
|
||||
* We still need to refresh the index here.
|
||||
*/
|
||||
if (!pathspec || !*pathspec) {
|
||||
fd = hold_locked_index(&index_lock, 1);
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
if (write_cache(fd, active_cache, active_nr) ||
|
||||
close(fd) || commit_locked_index(&index_lock))
|
||||
die("unable to write new_index file");
|
||||
commit_style = COMMIT_AS_IS;
|
||||
return get_index_file();
|
||||
}
|
||||
|
||||
/*
|
||||
* A partial commit.
|
||||
*
|
||||
* (0) find the set of affected paths;
|
||||
* (1) get lock on the real index file;
|
||||
* (2) update the_index with the given paths;
|
||||
* (3) write the_index out to the real index (still locked);
|
||||
* (4) get lock on the false index file;
|
||||
* (5) reset the_index from HEAD;
|
||||
* (6) update the_index the same way as (2);
|
||||
* (7) write the_index out to the false index file;
|
||||
* (8) return the name of the false index file (still locked);
|
||||
*
|
||||
* The caller should run hooks on the locked false index, and
|
||||
* create commit from it. Then
|
||||
* (A) if all goes well, commit the real index;
|
||||
* (B) on failure, rollback the real index;
|
||||
* In either case, rollback the false index.
|
||||
*/
|
||||
commit_style = COMMIT_PARTIAL;
|
||||
|
||||
if (file_exists(git_path("MERGE_HEAD")))
|
||||
die("cannot do a partial commit during a merge.");
|
||||
|
||||
memset(&partial, 0, sizeof(partial));
|
||||
partial.strdup_paths = 1;
|
||||
if (list_paths(&partial, initial_commit ? NULL : "HEAD", prefix, pathspec))
|
||||
exit(1);
|
||||
|
||||
discard_cache();
|
||||
if (read_cache() < 0)
|
||||
die("cannot read the index");
|
||||
|
||||
fd = hold_locked_index(&index_lock, 1);
|
||||
add_remove_files(&partial);
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
if (write_cache(fd, active_cache, active_nr) || close(fd))
|
||||
die("unable to write new_index file");
|
||||
|
||||
fd = hold_lock_file_for_update(&false_lock,
|
||||
git_path("next-index-%d", getpid()), 1);
|
||||
discard_cache();
|
||||
if (!initial_commit) {
|
||||
tree = parse_tree_indirect(head_sha1);
|
||||
if (!tree)
|
||||
die("failed to unpack HEAD tree object");
|
||||
if (read_tree(tree, 0, NULL))
|
||||
die("failed to read HEAD tree object");
|
||||
}
|
||||
add_remove_files(&partial);
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
|
||||
if (write_cache(fd, active_cache, active_nr) || close(fd))
|
||||
die("unable to write temporary index file");
|
||||
return false_lock.filename;
|
||||
}
|
||||
|
||||
static int run_status(FILE *fp, const char *index_file, const char *prefix)
|
||||
{
|
||||
struct wt_status s;
|
||||
|
||||
wt_status_prepare(&s);
|
||||
s.prefix = prefix;
|
||||
|
||||
if (amend) {
|
||||
s.amend = 1;
|
||||
s.reference = "HEAD^1";
|
||||
}
|
||||
s.verbose = verbose;
|
||||
s.untracked = untracked_files;
|
||||
s.index_file = index_file;
|
||||
s.fp = fp;
|
||||
|
||||
wt_status_print(&s);
|
||||
|
||||
return s.commitable;
|
||||
}
|
||||
|
||||
static const char sign_off_header[] = "Signed-off-by: ";
|
||||
|
||||
static int prepare_log_message(const char *index_file, const char *prefix)
|
||||
{
|
||||
struct stat statbuf;
|
||||
int commitable, saved_color_setting;
|
||||
struct strbuf sb;
|
||||
char *buffer;
|
||||
FILE *fp;
|
||||
|
||||
strbuf_init(&sb, 0);
|
||||
if (message.len) {
|
||||
strbuf_addbuf(&sb, &message);
|
||||
} else if (logfile && !strcmp(logfile, "-")) {
|
||||
if (isatty(0))
|
||||
fprintf(stderr, "(reading log message from standard input)\n");
|
||||
if (strbuf_read(&sb, 0, 0) < 0)
|
||||
die("could not read log from standard input");
|
||||
} else if (logfile) {
|
||||
if (strbuf_read_file(&sb, logfile, 0) < 0)
|
||||
die("could not read log file '%s': %s",
|
||||
logfile, strerror(errno));
|
||||
} else if (use_message) {
|
||||
buffer = strstr(use_message_buffer, "\n\n");
|
||||
if (!buffer || buffer[2] == '\0')
|
||||
die("commit has empty message");
|
||||
strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
|
||||
} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
|
||||
if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
|
||||
die("could not read MERGE_MSG: %s", strerror(errno));
|
||||
} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
|
||||
if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
|
||||
die("could not read SQUASH_MSG: %s", strerror(errno));
|
||||
} else if (template_file && !stat(template_file, &statbuf)) {
|
||||
if (strbuf_read_file(&sb, template_file, 0) < 0)
|
||||
die("could not read %s: %s",
|
||||
template_file, strerror(errno));
|
||||
}
|
||||
|
||||
fp = fopen(git_path(commit_editmsg), "w");
|
||||
if (fp == NULL)
|
||||
die("could not open %s\n", git_path(commit_editmsg));
|
||||
|
||||
stripspace(&sb, 0);
|
||||
|
||||
if (signoff) {
|
||||
struct strbuf sob;
|
||||
int i;
|
||||
|
||||
strbuf_init(&sob, 0);
|
||||
strbuf_addstr(&sob, sign_off_header);
|
||||
strbuf_addstr(&sob, fmt_ident(getenv("GIT_COMMITTER_NAME"),
|
||||
getenv("GIT_COMMITTER_EMAIL"),
|
||||
"", 1));
|
||||
strbuf_addch(&sob, '\n');
|
||||
|
||||
for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
|
||||
; /* do nothing */
|
||||
if (prefixcmp(sb.buf + i, sob.buf)) {
|
||||
if (prefixcmp(sb.buf + i, sign_off_header))
|
||||
strbuf_addch(&sb, '\n');
|
||||
strbuf_addbuf(&sb, &sob);
|
||||
}
|
||||
strbuf_release(&sob);
|
||||
}
|
||||
|
||||
if (fwrite(sb.buf, 1, sb.len, fp) < sb.len)
|
||||
die("could not write commit template: %s\n",
|
||||
strerror(errno));
|
||||
|
||||
strbuf_release(&sb);
|
||||
|
||||
if (in_merge && !no_edit)
|
||||
fprintf(fp,
|
||||
"#\n"
|
||||
"# It looks like you may be committing a MERGE.\n"
|
||||
"# If this is not correct, please remove the file\n"
|
||||
"# %s\n"
|
||||
"# and try again.\n"
|
||||
"#\n",
|
||||
git_path("MERGE_HEAD"));
|
||||
|
||||
fprintf(fp,
|
||||
"\n"
|
||||
"# Please enter the commit message for your changes.\n"
|
||||
"# (Comment lines starting with '#' will not be included)\n");
|
||||
if (only_include_assumed)
|
||||
fprintf(fp, "# %s\n", only_include_assumed);
|
||||
|
||||
saved_color_setting = wt_status_use_color;
|
||||
wt_status_use_color = 0;
|
||||
commitable = run_status(fp, index_file, prefix);
|
||||
wt_status_use_color = saved_color_setting;
|
||||
|
||||
fclose(fp);
|
||||
|
||||
return commitable;
|
||||
}
|
||||
|
||||
/*
|
||||
* Find out if the message starting at position 'start' in the strbuf
|
||||
* contains only whitespace and Signed-off-by lines.
|
||||
*/
|
||||
static int message_is_empty(struct strbuf *sb, int start)
|
||||
{
|
||||
struct strbuf tmpl;
|
||||
const char *nl;
|
||||
int eol, i;
|
||||
|
||||
/* See if the template is just a prefix of the message. */
|
||||
strbuf_init(&tmpl, 0);
|
||||
if (template_file && strbuf_read_file(&tmpl, template_file, 0) > 0) {
|
||||
stripspace(&tmpl, 1);
|
||||
if (start + tmpl.len <= sb->len &&
|
||||
memcmp(tmpl.buf, sb->buf + start, tmpl.len) == 0)
|
||||
start += tmpl.len;
|
||||
}
|
||||
strbuf_release(&tmpl);
|
||||
|
||||
/* Check if the rest is just whitespace and Signed-of-by's. */
|
||||
for (i = start; i < sb->len; i++) {
|
||||
nl = memchr(sb->buf + i, '\n', sb->len - i);
|
||||
if (nl)
|
||||
eol = nl - sb->buf;
|
||||
else
|
||||
eol = sb->len;
|
||||
|
||||
if (strlen(sign_off_header) <= eol - i &&
|
||||
!prefixcmp(sb->buf + i, sign_off_header)) {
|
||||
i = eol;
|
||||
continue;
|
||||
}
|
||||
while (i < eol)
|
||||
if (!isspace(sb->buf[i++]))
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void determine_author_info(struct strbuf *sb)
|
||||
{
|
||||
char *name, *email, *date;
|
||||
|
||||
name = getenv("GIT_AUTHOR_NAME");
|
||||
email = getenv("GIT_AUTHOR_EMAIL");
|
||||
date = getenv("GIT_AUTHOR_DATE");
|
||||
|
||||
if (use_message) {
|
||||
const char *a, *lb, *rb, *eol;
|
||||
|
||||
a = strstr(use_message_buffer, "\nauthor ");
|
||||
if (!a)
|
||||
die("invalid commit: %s\n", use_message);
|
||||
|
||||
lb = strstr(a + 8, " <");
|
||||
rb = strstr(a + 8, "> ");
|
||||
eol = strchr(a + 8, '\n');
|
||||
if (!lb || !rb || !eol)
|
||||
die("invalid commit: %s\n", use_message);
|
||||
|
||||
name = xstrndup(a + 8, lb - (a + 8));
|
||||
email = xstrndup(lb + 2, rb - (lb + 2));
|
||||
date = xstrndup(rb + 2, eol - (rb + 2));
|
||||
}
|
||||
|
||||
if (force_author) {
|
||||
const char *lb = strstr(force_author, " <");
|
||||
const char *rb = strchr(force_author, '>');
|
||||
|
||||
if (!lb || !rb)
|
||||
die("malformed --author parameter\n");
|
||||
name = xstrndup(force_author, lb - force_author);
|
||||
email = xstrndup(lb + 2, rb - (lb + 2));
|
||||
}
|
||||
|
||||
strbuf_addf(sb, "author %s\n", fmt_ident(name, email, date, 1));
|
||||
}
|
||||
|
||||
static int parse_and_validate_options(int argc, const char *argv[])
|
||||
{
|
||||
int f = 0;
|
||||
|
||||
argc = parse_options(argc, argv, builtin_commit_options,
|
||||
builtin_commit_usage, 0);
|
||||
|
||||
if (logfile || message.len || use_message)
|
||||
no_edit = 1;
|
||||
if (edit_flag)
|
||||
no_edit = 0;
|
||||
|
||||
if (get_sha1("HEAD", head_sha1))
|
||||
initial_commit = 1;
|
||||
|
||||
if (!get_sha1("MERGE_HEAD", merge_head_sha1))
|
||||
in_merge = 1;
|
||||
|
||||
/* Sanity check options */
|
||||
if (amend && initial_commit)
|
||||
die("You have nothing to amend.");
|
||||
if (amend && in_merge)
|
||||
die("You are in the middle of a merger -- cannot amend.");
|
||||
|
||||
if (use_message)
|
||||
f++;
|
||||
if (edit_message)
|
||||
f++;
|
||||
if (logfile)
|
||||
f++;
|
||||
if (f > 1)
|
||||
die("Only one of -c/-C/-F can be used.");
|
||||
if (message.len && f > 0)
|
||||
die("Option -m cannot be combined with -c/-C/-F.");
|
||||
if (edit_message)
|
||||
use_message = edit_message;
|
||||
if (amend)
|
||||
use_message = "HEAD";
|
||||
if (use_message) {
|
||||
unsigned char sha1[20];
|
||||
static char utf8[] = "UTF-8";
|
||||
const char *out_enc;
|
||||
char *enc, *end;
|
||||
struct commit *commit;
|
||||
|
||||
if (get_sha1(use_message, sha1))
|
||||
die("could not lookup commit %s", use_message);
|
||||
commit = lookup_commit(sha1);
|
||||
if (!commit || parse_commit(commit))
|
||||
die("could not parse commit %s", use_message);
|
||||
|
||||
enc = strstr(commit->buffer, "\nencoding");
|
||||
if (enc) {
|
||||
end = strchr(enc + 10, '\n');
|
||||
enc = xstrndup(enc + 10, end - (enc + 10));
|
||||
} else {
|
||||
enc = utf8;
|
||||
}
|
||||
out_enc = git_commit_encoding ? git_commit_encoding : utf8;
|
||||
|
||||
if (strcmp(out_enc, enc))
|
||||
use_message_buffer =
|
||||
reencode_string(commit->buffer, out_enc, enc);
|
||||
|
||||
/*
|
||||
* If we failed to reencode the buffer, just copy it
|
||||
* byte for byte so the user can try to fix it up.
|
||||
* This also handles the case where input and output
|
||||
* encodings are identical.
|
||||
*/
|
||||
if (use_message_buffer == NULL)
|
||||
use_message_buffer = xstrdup(commit->buffer);
|
||||
if (enc != utf8)
|
||||
free(enc);
|
||||
}
|
||||
|
||||
if (!!also + !!only + !!all + !!interactive > 1)
|
||||
die("Only one of --include/--only/--all/--interactive can be used.");
|
||||
if (argc == 0 && (also || (only && !amend)))
|
||||
die("No paths with --include/--only does not make sense.");
|
||||
if (argc == 0 && only && amend)
|
||||
only_include_assumed = "Clever... amending the last one with dirty index.";
|
||||
if (argc > 0 && !also && !only) {
|
||||
only_include_assumed = "Explicit paths specified without -i nor -o; assuming --only paths...";
|
||||
also = 0;
|
||||
}
|
||||
|
||||
if (all && argc > 0)
|
||||
die("Paths with -a does not make sense.");
|
||||
else if (interactive && argc > 0)
|
||||
die("Paths with --interactive does not make sense.");
|
||||
|
||||
return argc;
|
||||
}
|
||||
|
||||
int cmd_status(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *index_file;
|
||||
int commitable;
|
||||
|
||||
git_config(git_status_config);
|
||||
|
||||
argc = parse_and_validate_options(argc, argv);
|
||||
|
||||
index_file = prepare_index(argc, argv, prefix);
|
||||
|
||||
commitable = run_status(stdout, index_file, prefix);
|
||||
|
||||
rollback_index_files();
|
||||
|
||||
return commitable ? 0 : 1;
|
||||
}
|
||||
|
||||
static int run_hook(const char *index_file, const char *name, const char *arg)
|
||||
{
|
||||
struct child_process hook;
|
||||
const char *argv[3], *env[2];
|
||||
char index[PATH_MAX];
|
||||
|
||||
argv[0] = git_path("hooks/%s", name);
|
||||
argv[1] = arg;
|
||||
argv[2] = NULL;
|
||||
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
|
||||
env[0] = index;
|
||||
env[1] = NULL;
|
||||
|
||||
if (access(argv[0], X_OK) < 0)
|
||||
return 0;
|
||||
|
||||
memset(&hook, 0, sizeof(hook));
|
||||
hook.argv = argv;
|
||||
hook.no_stdin = 1;
|
||||
hook.stdout_to_stderr = 1;
|
||||
hook.env = env;
|
||||
|
||||
return run_command(&hook);
|
||||
}
|
||||
|
||||
static void print_summary(const char *prefix, const unsigned char *sha1)
|
||||
{
|
||||
struct rev_info rev;
|
||||
struct commit *commit;
|
||||
|
||||
commit = lookup_commit(sha1);
|
||||
if (!commit)
|
||||
die("couldn't look up newly created commit\n");
|
||||
if (!commit || parse_commit(commit))
|
||||
die("could not parse newly created commit");
|
||||
|
||||
init_revisions(&rev, prefix);
|
||||
setup_revisions(0, NULL, &rev, NULL);
|
||||
|
||||
rev.abbrev = 0;
|
||||
rev.diff = 1;
|
||||
rev.diffopt.output_format =
|
||||
DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY;
|
||||
|
||||
rev.verbose_header = 1;
|
||||
rev.show_root_diff = 1;
|
||||
rev.commit_format = get_commit_format("format:%h: %s");
|
||||
rev.always_show_header = 1;
|
||||
|
||||
printf("Created %scommit ", initial_commit ? "initial " : "");
|
||||
|
||||
log_tree_commit(&rev, commit);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
int git_commit_config(const char *k, const char *v)
|
||||
{
|
||||
if (!strcmp(k, "commit.template")) {
|
||||
template_file = xstrdup(v);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return git_status_config(k, v);
|
||||
}
|
||||
|
||||
static const char commit_utf8_warn[] =
|
||||
"Warning: commit message does not conform to UTF-8.\n"
|
||||
"You may want to amend it after fixing the message, or set the config\n"
|
||||
"variable i18n.commitencoding to the encoding your project uses.\n";
|
||||
|
||||
int cmd_commit(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int header_len;
|
||||
struct strbuf sb;
|
||||
const char *index_file, *reflog_msg;
|
||||
char *nl, *p;
|
||||
unsigned char commit_sha1[20];
|
||||
struct ref_lock *ref_lock;
|
||||
|
||||
git_config(git_commit_config);
|
||||
|
||||
argc = parse_and_validate_options(argc, argv);
|
||||
|
||||
index_file = prepare_index(argc, argv, prefix);
|
||||
|
||||
if (!no_verify && run_hook(index_file, "pre-commit", NULL)) {
|
||||
rollback_index_files();
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!prepare_log_message(index_file, prefix) && !in_merge) {
|
||||
run_status(stdout, index_file, prefix);
|
||||
rollback_index_files();
|
||||
unlink(commit_editmsg);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Re-read the index as pre-commit hook could have updated it,
|
||||
* and write it out as a tree.
|
||||
*/
|
||||
discard_cache();
|
||||
read_cache_from(index_file);
|
||||
if (!active_cache_tree)
|
||||
active_cache_tree = cache_tree();
|
||||
if (cache_tree_update(active_cache_tree,
|
||||
active_cache, active_nr, 0, 0) < 0) {
|
||||
rollback_index_files();
|
||||
die("Error building trees");
|
||||
}
|
||||
|
||||
/*
|
||||
* The commit object
|
||||
*/
|
||||
strbuf_init(&sb, 0);
|
||||
strbuf_addf(&sb, "tree %s\n",
|
||||
sha1_to_hex(active_cache_tree->sha1));
|
||||
|
||||
/* Determine parents */
|
||||
if (initial_commit) {
|
||||
reflog_msg = "commit (initial)";
|
||||
} else if (amend) {
|
||||
struct commit_list *c;
|
||||
struct commit *commit;
|
||||
|
||||
reflog_msg = "commit (amend)";
|
||||
commit = lookup_commit(head_sha1);
|
||||
if (!commit || parse_commit(commit))
|
||||
die("could not parse HEAD commit");
|
||||
|
||||
for (c = commit->parents; c; c = c->next)
|
||||
strbuf_addf(&sb, "parent %s\n",
|
||||
sha1_to_hex(c->item->object.sha1));
|
||||
} else if (in_merge) {
|
||||
struct strbuf m;
|
||||
FILE *fp;
|
||||
|
||||
reflog_msg = "commit (merge)";
|
||||
strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
|
||||
strbuf_init(&m, 0);
|
||||
fp = fopen(git_path("MERGE_HEAD"), "r");
|
||||
if (fp == NULL)
|
||||
die("could not open %s for reading: %s",
|
||||
git_path("MERGE_HEAD"), strerror(errno));
|
||||
while (strbuf_getline(&m, fp, '\n') != EOF)
|
||||
strbuf_addf(&sb, "parent %s\n", m.buf);
|
||||
fclose(fp);
|
||||
strbuf_release(&m);
|
||||
} else {
|
||||
reflog_msg = "commit";
|
||||
strbuf_addf(&sb, "parent %s\n", sha1_to_hex(head_sha1));
|
||||
}
|
||||
|
||||
determine_author_info(&sb);
|
||||
strbuf_addf(&sb, "committer %s\n", git_committer_info(1));
|
||||
if (!is_encoding_utf8(git_commit_encoding))
|
||||
strbuf_addf(&sb, "encoding %s\n", git_commit_encoding);
|
||||
strbuf_addch(&sb, '\n');
|
||||
|
||||
/* Get the commit message and validate it */
|
||||
header_len = sb.len;
|
||||
if (!no_edit)
|
||||
launch_editor(git_path(commit_editmsg), &sb);
|
||||
else if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
|
||||
rollback_index_files();
|
||||
die("could not read commit message\n");
|
||||
}
|
||||
if (run_hook(index_file, "commit-msg", git_path(commit_editmsg))) {
|
||||
rollback_index_files();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* Truncate the message just before the diff, if any. */
|
||||
p = strstr(sb.buf, "\ndiff --git a/");
|
||||
if (p != NULL)
|
||||
strbuf_setlen(&sb, p - sb.buf);
|
||||
|
||||
stripspace(&sb, 1);
|
||||
if (sb.len < header_len || message_is_empty(&sb, header_len)) {
|
||||
rollback_index_files();
|
||||
die("* no commit message? aborting commit.");
|
||||
}
|
||||
strbuf_addch(&sb, '\0');
|
||||
if (is_encoding_utf8(git_commit_encoding) && !is_utf8(sb.buf))
|
||||
fprintf(stderr, commit_utf8_warn);
|
||||
|
||||
if (write_sha1_file(sb.buf, sb.len - 1, commit_type, commit_sha1)) {
|
||||
rollback_index_files();
|
||||
die("failed to write commit object");
|
||||
}
|
||||
|
||||
ref_lock = lock_any_ref_for_update("HEAD",
|
||||
initial_commit ? NULL : head_sha1,
|
||||
0);
|
||||
|
||||
nl = strchr(sb.buf + header_len, '\n');
|
||||
if (nl)
|
||||
strbuf_setlen(&sb, nl + 1 - sb.buf);
|
||||
else
|
||||
strbuf_addch(&sb, '\n');
|
||||
strbuf_remove(&sb, 0, header_len);
|
||||
strbuf_insert(&sb, 0, reflog_msg, strlen(reflog_msg));
|
||||
strbuf_insert(&sb, strlen(reflog_msg), ": ", 2);
|
||||
|
||||
if (!ref_lock) {
|
||||
rollback_index_files();
|
||||
die("cannot lock HEAD ref");
|
||||
}
|
||||
if (write_ref_sha1(ref_lock, commit_sha1, sb.buf) < 0) {
|
||||
rollback_index_files();
|
||||
die("cannot update HEAD ref");
|
||||
}
|
||||
|
||||
unlink(git_path("MERGE_HEAD"));
|
||||
unlink(git_path("MERGE_MSG"));
|
||||
|
||||
commit_index_files();
|
||||
|
||||
rerere();
|
||||
run_hook(get_index_file(), "post-commit", NULL);
|
||||
if (!quiet)
|
||||
print_summary(prefix, commit_sha1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -38,28 +38,28 @@ static const char *tag_modified = "";
|
|||
|
||||
|
||||
/*
|
||||
* Match a pathspec against a filename. The first "len" characters
|
||||
* Match a pathspec against a filename. The first "skiplen" characters
|
||||
* are the common prefix
|
||||
*/
|
||||
static int match(const char **spec, char *ps_matched,
|
||||
const char *filename, int len)
|
||||
int pathspec_match(const char **spec, char *ps_matched,
|
||||
const char *filename, int skiplen)
|
||||
{
|
||||
const char *m;
|
||||
|
||||
while ((m = *spec++) != NULL) {
|
||||
int matchlen = strlen(m + len);
|
||||
int matchlen = strlen(m + skiplen);
|
||||
|
||||
if (!matchlen)
|
||||
goto matched;
|
||||
if (!strncmp(m + len, filename + len, matchlen)) {
|
||||
if (m[len + matchlen - 1] == '/')
|
||||
if (!strncmp(m + skiplen, filename + skiplen, matchlen)) {
|
||||
if (m[skiplen + matchlen - 1] == '/')
|
||||
goto matched;
|
||||
switch (filename[len + matchlen]) {
|
||||
switch (filename[skiplen + matchlen]) {
|
||||
case '/': case '\0':
|
||||
goto matched;
|
||||
}
|
||||
}
|
||||
if (!fnmatch(m + len, filename + len, 0))
|
||||
if (!fnmatch(m + skiplen, filename + skiplen, 0))
|
||||
goto matched;
|
||||
if (ps_matched)
|
||||
ps_matched++;
|
||||
|
|
@ -80,7 +80,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
|
|||
if (len >= ent->len)
|
||||
die("git-ls-files: internal error - directory entry not superset of prefix");
|
||||
|
||||
if (pathspec && !match(pathspec, ps_matched, ent->name, len))
|
||||
if (pathspec && !pathspec_match(pathspec, ps_matched, ent->name, len))
|
||||
return;
|
||||
|
||||
fputs(tag, stdout);
|
||||
|
|
@ -185,7 +185,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
|
|||
if (len >= ce_namelen(ce))
|
||||
die("git-ls-files: internal error - cache entry not superset of prefix");
|
||||
|
||||
if (pathspec && !match(pathspec, ps_matched, ce->name, len))
|
||||
if (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, len))
|
||||
return;
|
||||
|
||||
if (tag && *tag && show_valid_bit &&
|
||||
|
|
@ -331,7 +331,7 @@ static const char *verify_pathspec(const char *prefix)
|
|||
* that were given from the command line. We are not
|
||||
* going to write this index out.
|
||||
*/
|
||||
static void overlay_tree(const char *tree_name, const char *prefix)
|
||||
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
|
||||
{
|
||||
struct tree *tree;
|
||||
unsigned char sha1[20];
|
||||
|
|
@ -384,6 +384,42 @@ static void overlay_tree(const char *tree_name, const char *prefix)
|
|||
}
|
||||
}
|
||||
|
||||
int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset)
|
||||
{
|
||||
/*
|
||||
* Make sure all pathspec matched; otherwise it is an error.
|
||||
*/
|
||||
int num, errors = 0;
|
||||
for (num = 0; pathspec[num]; num++) {
|
||||
int other, found_dup;
|
||||
|
||||
if (ps_matched[num])
|
||||
continue;
|
||||
/*
|
||||
* The caller might have fed identical pathspec
|
||||
* twice. Do not barf on such a mistake.
|
||||
*/
|
||||
for (found_dup = other = 0;
|
||||
!found_dup && pathspec[other];
|
||||
other++) {
|
||||
if (other == num || !ps_matched[other])
|
||||
continue;
|
||||
if (!strcmp(pathspec[other], pathspec[num]))
|
||||
/*
|
||||
* Ok, we have a match already.
|
||||
*/
|
||||
found_dup = 1;
|
||||
}
|
||||
if (found_dup)
|
||||
continue;
|
||||
|
||||
error("pathspec '%s' did not match any file(s) known to git.",
|
||||
pathspec[num] + prefix_offset);
|
||||
errors++;
|
||||
}
|
||||
return errors;
|
||||
}
|
||||
|
||||
static const char ls_files_usage[] =
|
||||
"git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
|
||||
"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
|
||||
|
|
@ -568,47 +604,17 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
|
|||
*/
|
||||
if (show_stage || show_unmerged)
|
||||
die("ls-files --with-tree is incompatible with -s or -u");
|
||||
overlay_tree(with_tree, prefix);
|
||||
overlay_tree_on_cache(with_tree, prefix);
|
||||
}
|
||||
show_files(&dir, prefix);
|
||||
|
||||
if (ps_matched) {
|
||||
/* We need to make sure all pathspec matched otherwise
|
||||
* it is an error.
|
||||
*/
|
||||
int num, errors = 0;
|
||||
for (num = 0; pathspec[num]; num++) {
|
||||
int other, found_dup;
|
||||
|
||||
if (ps_matched[num])
|
||||
continue;
|
||||
/*
|
||||
* The caller might have fed identical pathspec
|
||||
* twice. Do not barf on such a mistake.
|
||||
*/
|
||||
for (found_dup = other = 0;
|
||||
!found_dup && pathspec[other];
|
||||
other++) {
|
||||
if (other == num || !ps_matched[other])
|
||||
continue;
|
||||
if (!strcmp(pathspec[other], pathspec[num]))
|
||||
/*
|
||||
* Ok, we have a match already.
|
||||
*/
|
||||
found_dup = 1;
|
||||
}
|
||||
if (found_dup)
|
||||
continue;
|
||||
|
||||
error("pathspec '%s' did not match any file(s) known to git.",
|
||||
pathspec[num] + prefix_offset);
|
||||
errors++;
|
||||
}
|
||||
|
||||
if (errors)
|
||||
int bad;
|
||||
bad = report_path_error(ps_matched, pathspec, prefix_offset);
|
||||
if (bad)
|
||||
fprintf(stderr, "Did you forget to 'git add'?\n");
|
||||
|
||||
return errors ? 1 : 0;
|
||||
return bad ? 1 : 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
* Implementation of git-merge-ours.sh as builtin
|
||||
*
|
||||
* Copyright (c) 2007 Thomas Harning Jr
|
||||
* Original:
|
||||
* Original Copyright (c) 2005 Junio C Hamano
|
||||
*
|
||||
* Pretend we resolved the heads, but declare our tree trumps everybody else.
|
||||
*/
|
||||
#include "git-compat-util.h"
|
||||
#include "builtin.h"
|
||||
|
||||
static const char *diff_index_args[] = {
|
||||
"diff-index", "--quiet", "--cached", "HEAD", "--", NULL
|
||||
};
|
||||
#define NARGS (ARRAY_SIZE(diff_index_args) - 1)
|
||||
|
||||
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
/*
|
||||
* We need to exit with 2 if the index does not match our HEAD tree,
|
||||
* because the current index is what we will be committing as the
|
||||
* merge result.
|
||||
*/
|
||||
if (cmd_diff_index(NARGS, diff_index_args, prefix))
|
||||
exit(2);
|
||||
exit(0);
|
||||
}
|
||||
|
|
@ -14,6 +14,7 @@ int cmd_runstatus(int argc, const char **argv, const char *prefix)
|
|||
|
||||
git_config(git_status_config);
|
||||
wt_status_prepare(&s);
|
||||
s.prefix = prefix;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (!strcmp(argv[i], "--color"))
|
||||
|
|
|
|||
|
|
@ -17,11 +17,9 @@ static const char builtin_tag_usage[] =
|
|||
|
||||
static char signingkey[1000];
|
||||
|
||||
static void launch_editor(const char *path, struct strbuf *buffer)
|
||||
void launch_editor(const char *path, struct strbuf *buffer)
|
||||
{
|
||||
const char *editor, *terminal;
|
||||
struct child_process child;
|
||||
const char *args[3];
|
||||
|
||||
editor = getenv("GIT_EDITOR");
|
||||
if (!editor && editor_program)
|
||||
|
|
@ -42,14 +40,12 @@ static void launch_editor(const char *path, struct strbuf *buffer)
|
|||
if (!editor)
|
||||
editor = "vi";
|
||||
|
||||
memset(&child, 0, sizeof(child));
|
||||
child.argv = args;
|
||||
args[0] = editor;
|
||||
args[1] = path;
|
||||
args[2] = NULL;
|
||||
if (strcmp(editor, ":")) {
|
||||
const char *args[] = { editor, path, NULL };
|
||||
|
||||
if (run_command(&child))
|
||||
if (run_command_v_opt(args, 0))
|
||||
die("There was a problem with the editor %s.", editor);
|
||||
}
|
||||
|
||||
if (strbuf_read_file(buffer, path, 0) < 0)
|
||||
die("could not read message file '%s': %s",
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ extern int cmd_check_attr(int argc, const char **argv, const char *prefix);
|
|||
extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_cherry(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_commit(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_describe(int argc, const char **argv, const char *prefix);
|
||||
|
|
@ -51,6 +52,7 @@ extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
|
|||
extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_mv(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
|
||||
|
|
@ -68,10 +70,10 @@ extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
|
|||
extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_revert(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_rm(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_show(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_status(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_tag(int argc, const char **argv, const char *prefix);
|
||||
|
|
|
|||
9
bundle.c
9
bundle.c
|
|
@ -6,6 +6,7 @@
|
|||
#include "revision.h"
|
||||
#include "list-objects.h"
|
||||
#include "run-command.h"
|
||||
#include "refs.h"
|
||||
|
||||
static const char bundle_signature[] = "# v2 git bundle\n";
|
||||
|
||||
|
|
@ -232,11 +233,17 @@ int create_bundle(struct bundle_header *header, const char *path,
|
|||
struct object_array_entry *e = revs.pending.objects + i;
|
||||
unsigned char sha1[20];
|
||||
char *ref;
|
||||
const char *display_ref;
|
||||
int flag;
|
||||
|
||||
if (e->item->flags & UNINTERESTING)
|
||||
continue;
|
||||
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
|
||||
continue;
|
||||
if (!resolve_ref(e->name, sha1, 1, &flag))
|
||||
flag = 0;
|
||||
display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
|
||||
|
||||
/*
|
||||
* Make sure the refs we wrote out is correct; --max-count and
|
||||
* other limiting options could have prevented all the tips
|
||||
|
|
@ -287,7 +294,7 @@ int create_bundle(struct bundle_header *header, const char *path,
|
|||
ref_count++;
|
||||
write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
|
||||
write_or_die(bundle_fd, " ", 1);
|
||||
write_or_die(bundle_fd, ref, strlen(ref));
|
||||
write_or_die(bundle_fd, display_ref, strlen(display_ref));
|
||||
write_or_die(bundle_fd, "\n", 1);
|
||||
free(ref);
|
||||
}
|
||||
|
|
|
|||
8
cache.h
8
cache.h
|
|
@ -604,10 +604,18 @@ extern void trace_argv_printf(const char **argv, int count, const char *format,
|
|||
extern int convert_to_git(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 */
|
||||
void add_files_to_cache(int verbose, const char *prefix, const char **pathspec);
|
||||
|
||||
/* diff.c */
|
||||
extern int diff_auto_refresh_index;
|
||||
|
||||
/* match-trees.c */
|
||||
void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
|
||||
|
||||
/* ls-files */
|
||||
int pathspec_match(const char **spec, char *matched, const char *filename, int skiplen);
|
||||
int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
|
||||
void overlay_tree_on_cache(const char *tree_name, const char *prefix);
|
||||
|
||||
#endif /* CACHE_H */
|
||||
|
|
|
|||
1
commit.h
1
commit.h
|
|
@ -114,7 +114,6 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads,
|
|||
int in_merge_bases(struct commit *, struct commit **, int);
|
||||
|
||||
extern int interactive_add(int argc, const char **argv);
|
||||
extern void add_files_to_cache(int verbose, const char *prefix, const char **files);
|
||||
extern int rerere(void);
|
||||
|
||||
static inline int single_parent(struct commit *commit)
|
||||
|
|
|
|||
5
dir.c
5
dir.c
|
|
@ -690,11 +690,10 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
|
|||
return dir->nr;
|
||||
}
|
||||
|
||||
int
|
||||
file_exists(const char *f)
|
||||
int file_exists(const char *f)
|
||||
{
|
||||
struct stat sb;
|
||||
return stat(f, &sb) == 0;
|
||||
return lstat(f, &sb) == 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -485,8 +485,13 @@ do
|
|||
SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
|
||||
SHORTHEAD=$(git rev-parse --short $HEAD)
|
||||
SHORTONTO=$(git rev-parse --short $ONTO)
|
||||
cat > "$TODO" << EOF
|
||||
# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
|
||||
git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
|
||||
--abbrev=7 --reverse --left-right --cherry-pick \
|
||||
$UPSTREAM...$HEAD | \
|
||||
sed -n "s/^>/pick /p" > "$TODO"
|
||||
cat >> "$TODO" << EOF
|
||||
|
||||
# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
|
||||
#
|
||||
# Commands:
|
||||
# pick = use commit
|
||||
|
|
@ -494,12 +499,9 @@ do
|
|||
# squash = use commit, but meld into previous commit
|
||||
#
|
||||
# If you remove a line here THAT COMMIT WILL BE LOST.
|
||||
# However, if you remove everything, the rebase will be aborted.
|
||||
#
|
||||
EOF
|
||||
git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
|
||||
--abbrev=7 --reverse --left-right --cherry-pick \
|
||||
$UPSTREAM...$HEAD | \
|
||||
sed -n "s/^>/pick /p" >> "$TODO"
|
||||
|
||||
has_action "$TODO" ||
|
||||
die_abort "Nothing to do"
|
||||
|
|
|
|||
4
git.c
4
git.c
|
|
@ -293,6 +293,7 @@ static void handle_internal_command(int argc, const char **argv)
|
|||
{ "check-attr", cmd_check_attr, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "cherry", cmd_cherry, RUN_SETUP },
|
||||
{ "cherry-pick", cmd_cherry_pick, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
|
||||
{ "config", cmd_config },
|
||||
{ "count-objects", cmd_count_objects, RUN_SETUP },
|
||||
|
|
@ -325,6 +326,7 @@ static void handle_internal_command(int argc, const char **argv)
|
|||
{ "mailsplit", cmd_mailsplit },
|
||||
{ "merge-base", cmd_merge_base, RUN_SETUP },
|
||||
{ "merge-file", cmd_merge_file },
|
||||
{ "merge-ours", cmd_merge_ours, RUN_SETUP },
|
||||
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "name-rev", cmd_name_rev, RUN_SETUP },
|
||||
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
|
||||
|
|
@ -341,10 +343,10 @@ static void handle_internal_command(int argc, const char **argv)
|
|||
{ "rev-parse", cmd_rev_parse },
|
||||
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "rm", cmd_rm, RUN_SETUP },
|
||||
{ "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
|
||||
{ "show-branch", cmd_show_branch, RUN_SETUP },
|
||||
{ "show", cmd_show, RUN_SETUP | USE_PAGER },
|
||||
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "stripspace", cmd_stripspace },
|
||||
{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
|
||||
{ "tag", cmd_tag, RUN_SETUP },
|
||||
|
|
|
|||
8
ident.c
8
ident.c
|
|
@ -224,13 +224,17 @@ const char *fmt_ident(const char *name, const char *email,
|
|||
}
|
||||
|
||||
strcpy(date, git_default_date);
|
||||
if (date_str)
|
||||
if (date_str) {
|
||||
if (*date_str)
|
||||
parse_date(date_str, date, sizeof(date));
|
||||
else
|
||||
date[0] = '\0';
|
||||
}
|
||||
|
||||
i = copy(buffer, sizeof(buffer), 0, name);
|
||||
i = add_raw(buffer, sizeof(buffer), i, " <");
|
||||
i = copy(buffer, sizeof(buffer), i, email);
|
||||
i = add_raw(buffer, sizeof(buffer), i, "> ");
|
||||
i = add_raw(buffer, sizeof(buffer), i, date[0] ? "> " : ">");
|
||||
i = copy(buffer, sizeof(buffer), i, date);
|
||||
if (i >= sizeof(buffer))
|
||||
die("Impossibly long personal identifier");
|
||||
|
|
|
|||
1
strbuf.h
1
strbuf.h
|
|
@ -117,5 +117,6 @@ extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
|
|||
extern int strbuf_getline(struct strbuf *, FILE *, int);
|
||||
|
||||
extern void stripspace(struct strbuf *buf, int skip_comments);
|
||||
extern void launch_editor(const char *path, struct strbuf *buffer);
|
||||
|
||||
#endif /* STRBUF_H */
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ EOF
|
|||
|
||||
git config core.excludesFile excludes-file
|
||||
|
||||
git runstatus | grep "^# " > output
|
||||
git status | grep "^# " > output
|
||||
|
||||
cat > expect << EOF
|
||||
# .gitignore
|
||||
|
|
|
|||
|
|
@ -149,7 +149,8 @@ test_expect_success 'stop on conflicting pick' '
|
|||
diff -u expect .git/.dotest-merge/patch &&
|
||||
diff -u expect2 file1 &&
|
||||
test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
|
||||
test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l)
|
||||
test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo |
|
||||
wc -l)
|
||||
'
|
||||
|
||||
test_expect_success 'abort' '
|
||||
|
|
|
|||
|
|
@ -71,10 +71,10 @@ test_expect_success 'favour same basenames over different ones' '
|
|||
git rm path1 &&
|
||||
mkdir subdir &&
|
||||
git mv another-path subdir/path1 &&
|
||||
git runstatus | grep "renamed: .*path1 -> subdir/path1"'
|
||||
git status | grep "renamed: .*path1 -> subdir/path1"'
|
||||
|
||||
test_expect_success 'favour same basenames even with minor differences' '
|
||||
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
|
||||
git runstatus | grep "renamed: .*path1 -> subdir/path1"'
|
||||
git status | grep "renamed: .*path1 -> subdir/path1"'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -215,4 +215,17 @@ test_expect_success 'quoting of a strangely named repo' '
|
|||
grep "fatal: '\''a\\\\!'\''b'\''" result
|
||||
'
|
||||
|
||||
test_expect_success 'bundle should record HEAD correctly' '
|
||||
|
||||
cd "$D" &&
|
||||
git bundle create bundle5 HEAD master &&
|
||||
git bundle list-heads bundle5 >actual &&
|
||||
for h in HEAD refs/heads/master
|
||||
do
|
||||
echo "$(git rev-parse --verify $h) $h"
|
||||
done >expect &&
|
||||
diff -u expect actual
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -122,7 +122,20 @@ test_expect_success 'using alternate GIT_INDEX_FILE (2)' '
|
|||
|
||||
) &&
|
||||
cmp .git/index saved-index >/dev/null
|
||||
'
|
||||
|
||||
cat > expect << EOF
|
||||
zort
|
||||
|
||||
Signed-off-by: C O Mitter <committer@example.com>
|
||||
EOF
|
||||
|
||||
test_expect_success '--signoff' '
|
||||
echo "yet another content *narf*" >> foo &&
|
||||
echo "zort" |
|
||||
GIT_EDITOR=../t7500/add-content git commit -s -F - foo &&
|
||||
git cat-file commit HEAD | sed "1,/^$/d" > output &&
|
||||
diff expect output
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -242,4 +242,29 @@ test_expect_success 'multiple -m' '
|
|||
|
||||
'
|
||||
|
||||
author="The Real Author <someguy@his.email.org>"
|
||||
test_expect_success 'amend commit to fix author' '
|
||||
|
||||
oldtick=$GIT_AUTHOR_DATE &&
|
||||
test_tick &&
|
||||
git reset --hard &&
|
||||
git cat-file -p HEAD |
|
||||
sed -e "s/author.*/author $author $oldtick/" \
|
||||
-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
|
||||
expected &&
|
||||
git commit --amend --author="$author" &&
|
||||
git cat-file -p HEAD > current &&
|
||||
diff expected current
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'git commit <file> with dirty index' '
|
||||
echo tacocat > elif &&
|
||||
echo tehlulz > chz &&
|
||||
git add chz &&
|
||||
git commit elif -m "tacocat is a palindrome" &&
|
||||
git show --stat | grep elif &&
|
||||
git diff --cached | grep chz
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='git commit porcelain-ish'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'the basics' '
|
||||
|
||||
echo doing partial >"commit is" &&
|
||||
mkdir not &&
|
||||
echo very much encouraged but we should >not/forbid &&
|
||||
git add "commit is" not &&
|
||||
echo update added "commit is" file >"commit is" &&
|
||||
echo also update another >not/forbid &&
|
||||
test_tick &&
|
||||
git commit -a -m "initial with -a" &&
|
||||
|
||||
git cat-file blob HEAD:"commit is" >current.1 &&
|
||||
git cat-file blob HEAD:not/forbid >current.2 &&
|
||||
|
||||
cmp current.1 "commit is" &&
|
||||
cmp current.2 not/forbid
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'partial' '
|
||||
|
||||
echo another >"commit is" &&
|
||||
echo another >not/forbid &&
|
||||
test_tick &&
|
||||
git commit -m "partial commit to handle a file" "commit is" &&
|
||||
|
||||
changed=$(git diff-tree --name-only HEAD^ HEAD) &&
|
||||
test "$changed" = "commit is"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'partial modification in a subdirecotry' '
|
||||
|
||||
test_tick &&
|
||||
git commit -m "partial commit to subdirectory" not &&
|
||||
|
||||
changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
|
||||
test "$changed" = "not/forbid"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'partial removal' '
|
||||
|
||||
git rm not/forbid &&
|
||||
git commit -m "partial commit to remove not/forbid" not &&
|
||||
|
||||
changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
|
||||
test "$changed" = "not/forbid" &&
|
||||
remain=$(git ls-tree -r --name-only HEAD) &&
|
||||
test "$remain" = "commit is"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'sign off' '
|
||||
|
||||
>positive &&
|
||||
git add positive &&
|
||||
git commit -s -m "thank you" &&
|
||||
actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
|
||||
expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
|
||||
test "z$actual" = "z$expected"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'multiple -m' '
|
||||
|
||||
>negative &&
|
||||
git add negative &&
|
||||
git commit -m "one" -m "two" -m "three" &&
|
||||
actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
|
||||
expected=$(echo one; echo; echo two; echo; echo three) &&
|
||||
test "z$actual" = "z$expected"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'verbose' '
|
||||
|
||||
echo minus >negative &&
|
||||
git add negative &&
|
||||
git status -v | sed -ne "/^diff --git /p" >actual &&
|
||||
echo "diff --git a/negative b/negative" >expect &&
|
||||
diff -u expect actual
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
@ -0,0 +1,91 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Johannes E. Schindelin
|
||||
#
|
||||
|
||||
test_description='git-status'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
: > tracked &&
|
||||
: > modified &&
|
||||
mkdir dir1 &&
|
||||
: > dir1/tracked &&
|
||||
: > dir1/modified &&
|
||||
mkdir dir2 &&
|
||||
: > dir1/tracked &&
|
||||
: > dir1/modified &&
|
||||
git add . &&
|
||||
test_tick &&
|
||||
git commit -m initial &&
|
||||
: > untracked &&
|
||||
: > dir1/untracked &&
|
||||
: > dir2/untracked &&
|
||||
echo 1 > dir1/modified &&
|
||||
echo 2 > dir2/modified &&
|
||||
echo 3 > dir2/added &&
|
||||
git add dir2/added
|
||||
'
|
||||
|
||||
cat > expect << \EOF
|
||||
# On branch master
|
||||
# Changes to be committed:
|
||||
# (use "git reset HEAD <file>..." to unstage)
|
||||
#
|
||||
# new file: dir2/added
|
||||
#
|
||||
# Changed but not updated:
|
||||
# (use "git add <file>..." to update what will be committed)
|
||||
#
|
||||
# modified: dir1/modified
|
||||
#
|
||||
# Untracked files:
|
||||
# (use "git add <file>..." to include in what will be committed)
|
||||
#
|
||||
# dir1/untracked
|
||||
# dir2/modified
|
||||
# dir2/untracked
|
||||
# expect
|
||||
# output
|
||||
# untracked
|
||||
EOF
|
||||
|
||||
test_expect_success 'status' '
|
||||
|
||||
git status > output &&
|
||||
git diff expect output
|
||||
|
||||
'
|
||||
|
||||
cat > expect << \EOF
|
||||
# On branch master
|
||||
# Changes to be committed:
|
||||
# (use "git reset HEAD <file>..." to unstage)
|
||||
#
|
||||
# new file: ../dir2/added
|
||||
#
|
||||
# Changed but not updated:
|
||||
# (use "git add <file>..." to update what will be committed)
|
||||
#
|
||||
# modified: ../dir1/modified
|
||||
#
|
||||
# Untracked files:
|
||||
# (use "git add <file>..." to include in what will be committed)
|
||||
#
|
||||
# untracked
|
||||
# ../dir2/modified
|
||||
# ../dir2/untracked
|
||||
# ../expect
|
||||
# ../output
|
||||
# ../untracked
|
||||
EOF
|
||||
|
||||
test_expect_success 'status with relative paths' '
|
||||
|
||||
(cd dir1 && git status) > output &&
|
||||
git diff expect output
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
85
wt-status.c
85
wt-status.c
|
|
@ -81,33 +81,46 @@ static void wt_status_print_trailer(struct wt_status *s)
|
|||
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#");
|
||||
}
|
||||
|
||||
static const char *quote_crlf(const char *in, char *buf, size_t sz)
|
||||
static char *quote_path(const char *in, int len,
|
||||
struct strbuf *out, const char *prefix)
|
||||
{
|
||||
const char *scan;
|
||||
char *out;
|
||||
const char *ret = in;
|
||||
if (len > 0)
|
||||
strbuf_grow(out, len);
|
||||
strbuf_setlen(out, 0);
|
||||
|
||||
for (scan = in, out = buf; *scan; scan++) {
|
||||
int ch = *scan;
|
||||
int quoted;
|
||||
if (prefix) {
|
||||
int off = 0;
|
||||
while (prefix[off] && off < len && prefix[off] == in[off])
|
||||
if (prefix[off] == '/') {
|
||||
prefix += off + 1;
|
||||
in += off + 1;
|
||||
len -= off + 1;
|
||||
off = 0;
|
||||
} else
|
||||
off++;
|
||||
|
||||
for (; *prefix; prefix++)
|
||||
if (*prefix == '/')
|
||||
strbuf_addstr(out, "../");
|
||||
}
|
||||
|
||||
for (; (len < 0 && *in) || len > 0; in++, len--) {
|
||||
int ch = *in;
|
||||
|
||||
switch (ch) {
|
||||
case '\n':
|
||||
quoted = 'n';
|
||||
strbuf_addstr(out, "\\n");
|
||||
break;
|
||||
case '\r':
|
||||
quoted = 'r';
|
||||
strbuf_addstr(out, "\\r");
|
||||
break;
|
||||
default:
|
||||
*out++ = ch;
|
||||
strbuf_addch(out, ch);
|
||||
continue;
|
||||
}
|
||||
*out++ = '\\';
|
||||
*out++ = quoted;
|
||||
ret = buf;
|
||||
}
|
||||
*out = '\0';
|
||||
return ret;
|
||||
|
||||
return out->buf;
|
||||
}
|
||||
|
||||
static void wt_status_print_filepair(struct wt_status *s,
|
||||
|
|
@ -115,10 +128,12 @@ static void wt_status_print_filepair(struct wt_status *s,
|
|||
{
|
||||
const char *c = color(t);
|
||||
const char *one, *two;
|
||||
char onebuf[PATH_MAX], twobuf[PATH_MAX];
|
||||
struct strbuf onebuf, twobuf;
|
||||
|
||||
one = quote_crlf(p->one->path, onebuf, sizeof(onebuf));
|
||||
two = quote_crlf(p->two->path, twobuf, sizeof(twobuf));
|
||||
strbuf_init(&onebuf, 0);
|
||||
strbuf_init(&twobuf, 0);
|
||||
one = quote_path(p->one->path, -1, &onebuf, s->prefix);
|
||||
two = quote_path(p->two->path, -1, &twobuf, s->prefix);
|
||||
|
||||
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
|
||||
switch (p->status) {
|
||||
|
|
@ -150,6 +165,8 @@ static void wt_status_print_filepair(struct wt_status *s,
|
|||
die("bug: unhandled diff status %c", p->status);
|
||||
}
|
||||
fprintf(s->fp, "\n");
|
||||
strbuf_release(&onebuf);
|
||||
strbuf_release(&twobuf);
|
||||
}
|
||||
|
||||
static void wt_status_print_updated_cb(struct diff_queue_struct *q,
|
||||
|
|
@ -204,8 +221,9 @@ static void wt_read_cache(struct wt_status *s)
|
|||
static void wt_status_print_initial(struct wt_status *s)
|
||||
{
|
||||
int i;
|
||||
char buf[PATH_MAX];
|
||||
struct strbuf buf;
|
||||
|
||||
strbuf_init(&buf, 0);
|
||||
wt_read_cache(s);
|
||||
if (active_nr) {
|
||||
s->commitable = 1;
|
||||
|
|
@ -214,11 +232,12 @@ static void wt_status_print_initial(struct wt_status *s)
|
|||
for (i = 0; i < active_nr; i++) {
|
||||
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
|
||||
color_fprintf_ln(s->fp, color(WT_STATUS_UPDATED), "new file: %s",
|
||||
quote_crlf(active_cache[i]->name,
|
||||
buf, sizeof(buf)));
|
||||
quote_path(active_cache[i]->name, -1,
|
||||
&buf, s->prefix));
|
||||
}
|
||||
if (active_nr)
|
||||
wt_status_print_trailer(s);
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static void wt_status_print_updated(struct wt_status *s)
|
||||
|
|
@ -252,7 +271,9 @@ static void wt_status_print_untracked(struct wt_status *s)
|
|||
struct dir_struct dir;
|
||||
int i;
|
||||
int shown_header = 0;
|
||||
struct strbuf buf;
|
||||
|
||||
strbuf_init(&buf, 0);
|
||||
memset(&dir, 0, sizeof(dir));
|
||||
|
||||
if (!s->untracked) {
|
||||
|
|
@ -284,20 +305,38 @@ static void wt_status_print_untracked(struct wt_status *s)
|
|||
shown_header = 1;
|
||||
}
|
||||
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
|
||||
color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED), "%.*s",
|
||||
ent->len, ent->name);
|
||||
color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED), "%s",
|
||||
quote_path(ent->name, ent->len,
|
||||
&buf, s->prefix));
|
||||
}
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static void wt_status_print_verbose(struct wt_status *s)
|
||||
{
|
||||
struct rev_info rev;
|
||||
int saved_stdout;
|
||||
|
||||
fflush(s->fp);
|
||||
|
||||
/* Sigh, the entire diff machinery is hardcoded to output to
|
||||
* stdout. Do the dup-dance...*/
|
||||
saved_stdout = dup(STDOUT_FILENO);
|
||||
if (saved_stdout < 0 ||dup2(fileno(s->fp), STDOUT_FILENO) < 0)
|
||||
die("couldn't redirect stdout\n");
|
||||
|
||||
init_revisions(&rev, NULL);
|
||||
setup_revisions(0, NULL, &rev, s->reference);
|
||||
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
||||
rev.diffopt.detect_rename = 1;
|
||||
wt_read_cache(s);
|
||||
run_diff_index(&rev, 1);
|
||||
|
||||
fflush(stdout);
|
||||
|
||||
if (dup2(saved_stdout, STDOUT_FILENO) < 0)
|
||||
die("couldn't restore stdout\n");
|
||||
close(saved_stdout);
|
||||
}
|
||||
|
||||
void wt_status_print(struct wt_status *s)
|
||||
|
|
|
|||
|
|
@ -23,9 +23,11 @@ struct wt_status {
|
|||
int workdir_untracked;
|
||||
const char *index_file;
|
||||
FILE *fp;
|
||||
const char *prefix;
|
||||
};
|
||||
|
||||
int git_status_config(const char *var, const char *value);
|
||||
int wt_status_use_color;
|
||||
void wt_status_prepare(struct wt_status *s);
|
||||
void wt_status_print(struct wt_status *s);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче