Merge branch 'fc/trivial'

* fc/trivial:
  remote: fix status with branch...rebase=preserve
  fetch: add missing documentation
  t: trivial whitespace cleanups
  abspath: trivial style fix
This commit is contained in:
Junio C Hamano 2013-12-17 11:46:32 -08:00
commit 4d1826d1d9
5 changed files with 12 additions and 6 deletions

View file

@ -37,6 +37,9 @@ or from several repositories at once if <group> is given and
there is a remotes.<group> entry in the configuration file.
(See linkgit:git-config[1]).
When no remote is specified, by default the `origin` remote will be used,
unless there's an upstream branch configured for the current branch.
OPTIONS
-------
include::fetch-options.txt[]

View file

@ -143,7 +143,7 @@ static const char *real_path_internal(const char *path, int die_on_error)
error_out:
free(last_elem);
if (*cwd && chdir(cwd))
die_errno ("Could not change back to '%s'", cwd);
die_errno("Could not change back to '%s'", cwd);
return retval;
}

View file

@ -307,8 +307,13 @@ static int config_read_branches(const char *key, const char *value, void *cb)
space = strchr(value, ' ');
}
string_list_append(&info->merge, xstrdup(value));
} else
info->rebase = git_config_bool(orig_key, value);
} else {
int v = git_config_maybe_bool(orig_key, value);
if (v >= 0)
info->rebase = v;
else if (!strcmp(value, "preserve"))
info->rebase = 1;
}
}
return 0;
}

View file

@ -7,7 +7,7 @@ Verify that plumbing commands work when .git is a file
. ./test-lib.sh
objpath() {
echo "$1" | sed -e 's|\(..\)|\1/|'
echo "$1" | sed -e 's|\(..\)|\1/|'
}
objck() {
@ -19,7 +19,6 @@ objck() {
fi
}
test_expect_success 'initial setup' '
REAL="$(pwd)/.real" &&
mv .git "$REAL"

View file

@ -13,7 +13,6 @@ attr_check () {
test_line_count = 0 err
}
test_expect_success 'setup' '
mkdir -p a/b/d a/c b &&
(