kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'fc/trivial' 

A random collection of style fixes and minor doc updates.

* fc/trivial:
  setup: trivial style fixes
  run-command: trivial style fixes
  diff: trivial style fix
  revision: trivial style fixes
  pretty: trivial style fix
  describe: trivial style fixes
  transport-helper: trivial style fix
  sha1-name: trivial style cleanup
  branch: trivial style fix
  revision: add missing include
  doc/pull: clarify the illustrations
  t: replace pulls with merges
  merge: simplify ff-only option
maint
Junio C Hamano 2013-11-06 14:34:43 -08:00
parent f26f72de15 abf03eeb8e
commit 152a9c17a8
16 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-pull.txt
View File

@ -42,6 +42,8 @@ Assume the following history exists and the current branch is
A---B---C master on origin A---B---C master on origin
/ /
D---E---F---G master D---E---F---G master
^
origin/master in your repository
------------ ------------


Then "`git pull`" will fetch and replay the changes from the remote Then "`git pull`" will fetch and replay the changes from the remote
@ -51,7 +53,7 @@ result in a new commit along with the names of the two parent commits
and a log message from the user describing the changes. and a log message from the user describing the changes.


------------ ------------
A---B---C remotes/origin/master A---B---C origin/master
/ \ / \
D---E---F---G---H master D---E---F---G---H master
------------ ------------

3
builtin/branch.c
View File

@ -975,9 +975,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
die(_("no such branch '%s'"), argv[0]); die(_("no such branch '%s'"), argv[0]);
} }


if (!branch_has_merge_config(branch)) { if (!branch_has_merge_config(branch))
die(_("Branch '%s' has no upstream information"), branch->name); die(_("Branch '%s' has no upstream information"), branch->name);
}


strbuf_addf(&buf, "branch.%s.remote", branch->name); strbuf_addf(&buf, "branch.%s.remote", branch->name);
git_config_set_multivar(buf.buf, NULL, NULL, 1); git_config_set_multivar(buf.buf, NULL, NULL, 1);

7
builtin/describe.c
View File

@ -9,7 +9,7 @@
#include "hash.h" #include "hash.h"
#include "argv-array.h" #include "argv-array.h"


#define SEEN (1u<<0) #define SEEN (1u << 0)
#define MAX_TAGS (FLAG_BITS - 1) #define MAX_TAGS (FLAG_BITS - 1)


static const char * const describe_usage[] = { static const char * const describe_usage[] = {
@ -36,7 +36,6 @@ static const char *diff_index_args[] = {
"diff-index", "--quiet", "HEAD", "--", NULL "diff-index", "--quiet", "HEAD", "--", NULL
}; };



struct commit_name { struct commit_name {
struct commit_name *next; struct commit_name *next;
unsigned char peeled[20]; unsigned char peeled[20];
@ -46,6 +45,7 @@ struct commit_name {
unsigned char sha1[20]; unsigned char sha1[20];
char *path; char *path;
}; };

static const char *prio_names[] = { static const char *prio_names[] = {
"head", "lightweight", "annotated", "head", "lightweight", "annotated",
}; };
@ -488,9 +488,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
} else if (dirty) { } else if (dirty) {
die(_("--dirty is incompatible with commit-ishes")); die(_("--dirty is incompatible with commit-ishes"));
} else { } else {
while (argc-- > 0) { while (argc-- > 0)
describe(*argv++, argc == 0); describe(*argv++, argc == 0);
}
} }
return 0; return 0;
} }

2
builtin/diff.c
View File

@ -169,7 +169,7 @@ static int builtin_diff_tree(struct rev_info *revs,
if (ent1->item->flags & UNINTERESTING) if (ent1->item->flags & UNINTERESTING)
swap = 1; swap = 1;
sha1[swap] = ent0->item->sha1; sha1[swap] = ent0->item->sha1;
sha1[1-swap] = ent1->item->sha1; sha1[1 - swap] = ent1->item->sha1;
diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt); diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
log_tree_diff_flush(revs); log_tree_diff_flush(revs);
return 0; return 0;

11
builtin/merge.c
View File

@ -186,13 +186,6 @@ static int option_parse_n(const struct option *opt,
return 0; return 0;
} }


static int option_parse_ff_only(const struct option *opt,
const char *arg, int unset)
{
fast_forward = FF_ONLY;
return 0;
}

static struct option builtin_merge_options[] = { static struct option builtin_merge_options[] = {
{ OPTION_CALLBACK, 'n', NULL, NULL, NULL, { OPTION_CALLBACK, 'n', NULL, NULL, NULL,
N_("do not show a diffstat at the end of the merge"), N_("do not show a diffstat at the end of the merge"),
@ -210,9 +203,9 @@ static struct option builtin_merge_options[] = {
OPT_BOOL('e', "edit", &option_edit, OPT_BOOL('e', "edit", &option_edit,
N_("edit message before committing")), N_("edit message before committing")),
OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW), OPT_SET_INT(0, "ff", &fast_forward, N_("allow fast-forward (default)"), FF_ALLOW),
{ OPTION_CALLBACK, 0, "ff-only", NULL, NULL, { OPTION_SET_INT, 0, "ff-only", &fast_forward, NULL,
N_("abort if fast-forward is not possible"), N_("abort if fast-forward is not possible"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG, option_parse_ff_only }, PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, FF_ONLY },
OPT_RERERE_AUTOUPDATE(&allow_rerere_auto), OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
OPT_BOOL(0, "verify-signatures", &verify_signatures, OPT_BOOL(0, "verify-signatures", &verify_signatures,
N_("Verify that the named commit has a valid GPG signature")), N_("Verify that the named commit has a valid GPG signature")),

2
pretty.c
View File

@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp,
static int is_empty_line(const char *line, int *len_p) static int is_empty_line(const char *line, int *len_p)
{ {
int len = *len_p; int len = *len_p;
while (len && isspace(line[len-1])) while (len && isspace(line[len - 1]))
len--; len--;
*len_p = len; *len_p = len;
return !len; return !len;

14
revision.c
View File

@ -1519,7 +1519,7 @@ struct cmdline_pathspec {
static void append_prune_data(struct cmdline_pathspec *prune, const char **av) static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
{ {
while (*av) { while (*av) {
ALLOC_GROW(prune->path, prune->nr+1, prune->alloc); ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
prune->path[prune->nr++] = *(av++); prune->path[prune->nr++] = *(av++);
} }
} }
@ -1531,7 +1531,7 @@ static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
int len = sb->len; int len = sb->len;
if (len && sb->buf[len - 1] == '\n') if (len && sb->buf[len - 1] == '\n')
sb->buf[--len] = '\0'; sb->buf[--len] = '\0';
ALLOC_GROW(prune->path, prune->nr+1, prune->alloc); ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
prune->path[prune->nr++] = xstrdup(sb->buf); prune->path[prune->nr++] = xstrdup(sb->buf);
} }
} }
@ -2134,7 +2134,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
* call init_pathspec() to set revs->prune_data here. * call init_pathspec() to set revs->prune_data here.
* } * }
*/ */
ALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc); ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
prune_data.path[prune_data.nr++] = NULL; prune_data.path[prune_data.nr++] = NULL;
parse_pathspec(&revs->prune_data, 0, 0, parse_pathspec(&revs->prune_data, 0, 0,
revs->prefix, prune_data.path); revs->prefix, prune_data.path);
@ -2987,7 +2987,7 @@ static struct commit *get_revision_internal(struct rev_info *revs)
if (revs->max_count) { if (revs->max_count) {
c = get_revision_1(revs); c = get_revision_1(revs);
if (c) { if (c) {
while (0 < revs->skip_count) { while (revs->skip_count > 0) {
revs->skip_count--; revs->skip_count--;
c = get_revision_1(revs); c = get_revision_1(revs);
if (!c) if (!c)
@ -3002,9 +3002,8 @@ static struct commit *get_revision_internal(struct rev_info *revs)
if (c) if (c)
c->object.flags |= SHOWN; c->object.flags |= SHOWN;


if (!revs->boundary) { if (!revs->boundary)
return c; return c;
}


if (!c) { if (!c) {
/* /*
@ -3050,9 +3049,8 @@ struct commit *get_revision(struct rev_info *revs)


if (revs->reverse) { if (revs->reverse) {
reversed = NULL; reversed = NULL;
while ((c = get_revision_internal(revs))) { while ((c = get_revision_internal(revs)))
commit_list_insert(c, &reversed); commit_list_insert(c, &reversed);
}
revs->commits = reversed; revs->commits = reversed;
revs->reverse = 0; revs->reverse = 0;
revs->reverse_output_stage = 1; revs->reverse_output_stage = 1;

1
revision.h
View File

@ -5,6 +5,7 @@
#include "grep.h" #include "grep.h"
#include "notes.h" #include "notes.h"
#include "commit.h" #include "commit.h"
#include "diff.h"


#define SEEN (1u<<0) #define SEEN (1u<<0)
#define UNINTERESTING (1u<<1) #define UNINTERESTING (1u<<1)

13
run-command.c
View File

@ -406,13 +406,12 @@ fail_pipe:
unsetenv(*cmd->env); unsetenv(*cmd->env);
} }
} }
if (cmd->git_cmd) { if (cmd->git_cmd)
execv_git_cmd(cmd->argv); execv_git_cmd(cmd->argv);
} else if (cmd->use_shell) { else if (cmd->use_shell)
execv_shell_cmd(cmd->argv); execv_shell_cmd(cmd->argv);
} else { else
sane_execvp(cmd->argv[0], (char *const*) cmd->argv); sane_execvp(cmd->argv[0], (char *const*) cmd->argv);
}
if (errno == ENOENT) { if (errno == ENOENT) {
if (!cmd->silent_exec_failure) if (!cmd->silent_exec_failure)
error("cannot run %s: %s", cmd->argv[0], error("cannot run %s: %s", cmd->argv[0],
@ -446,7 +445,6 @@ fail_pipe:
cmd->pid = -1; cmd->pid = -1;
} }
close(notify_pipe[0]); close(notify_pipe[0]);

} }
#else #else
{ {
@ -480,11 +478,10 @@ fail_pipe:
if (cmd->env) if (cmd->env)
env = make_augmented_environ(cmd->env); env = make_augmented_environ(cmd->env);


if (cmd->git_cmd) { if (cmd->git_cmd)
cmd->argv = prepare_git_cmd(cmd->argv); cmd->argv = prepare_git_cmd(cmd->argv);
} else if (cmd->use_shell) { else if (cmd->use_shell)
cmd->argv = prepare_shell_cmd(cmd->argv); cmd->argv = prepare_shell_cmd(cmd->argv);
}


cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir, cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
fhin, fhout, fherr); fhin, fhout, fherr);

4
setup.c
View File

@ -563,7 +563,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
{ {
const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT); const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
struct string_list ceiling_dirs = STRING_LIST_INIT_DUP; struct string_list ceiling_dirs = STRING_LIST_INIT_DUP;
static char cwd[PATH_MAX+1]; static char cwd[PATH_MAX + 1];
const char *gitdirenv, *ret; const char *gitdirenv, *ret;
char *gitfile; char *gitfile;
int len, offset, offset_parent, ceil_offset = -1; int len, offset, offset_parent, ceil_offset = -1;
@ -578,7 +578,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
if (nongit_ok) if (nongit_ok)
*nongit_ok = 0; *nongit_ok = 0;


if (!getcwd(cwd, sizeof(cwd)-1)) if (!getcwd(cwd, sizeof(cwd) - 1))
die_errno("Unable to read current working directory"); die_errno("Unable to read current working directory");
offset = len = strlen(cwd); offset = len = strlen(cwd);



1
sha1_name.c
View File

@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
return status; return status;
} }



int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data)
{ {
char hex_pfx[40]; char hex_pfx[40];

2
t/annotate-tests.sh
View File

@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' '
' '


test_expect_success 'merge branch1 & branch2' ' test_expect_success 'merge branch1 & branch2' '
git pull . branch1 git merge branch1
' '


test_expect_success 'blame 2 authors + 2 merged-in authors' ' test_expect_success 'blame 2 authors + 2 merged-in authors' '

2
t/t4200-rerere.sh
View File

@ -172,7 +172,7 @@ test_expect_success 'first postimage wins' '
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 && git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
git commit -q -a -m third && git commit -q -a -m third &&


test_must_fail git pull . first && test_must_fail git merge first &&
# rerere kicked in # rerere kicked in
! grep "^=======\$" a1 && ! grep "^=======\$" a1 &&
test_cmp expect a1 test_cmp expect a1

2
t/t9114-git-svn-dcommit-merge.sh
View File

@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
echo friend > README && echo friend > README &&
cat tmp >> README && cat tmp >> README &&
git commit -a -m "friend" && git commit -a -m "friend" &&
git pull . merge git merge merge
' '


test_debug 'gitk --all & sleep 1' test_debug 'gitk --all & sleep 1'

2
t/t9500-gitweb-standalone-no-errors.sh
View File

@ -328,7 +328,7 @@ test_expect_success \
git add b && git add b &&
git commit -a -m "On branch" && git commit -a -m "On branch" &&
git checkout master && git checkout master &&
git pull . b && git merge b &&
git tag merge_commit' git tag merge_commit'


test_expect_success \ test_expect_success \

1
transport-helper.c
View File

@ -269,6 +269,7 @@ static const char *unsupported_options[] = {
TRANS_OPT_THIN, TRANS_OPT_THIN,
TRANS_OPT_KEEP TRANS_OPT_KEEP
}; };

static const char *boolean_options[] = { static const char *boolean_options[] = {
TRANS_OPT_THIN, TRANS_OPT_THIN,
TRANS_OPT_KEEP, TRANS_OPT_KEEP,