Merge branch 'fc/random-cleanup'
Random cleanup. * fc/random-cleanup: gitignore: remove entry for git serve gitignore: drop duplicate entry for git-sh-i18n tests: lib-functions: trivial style cleanups test: completion: fix typos .gitignore: remove dangling file refspec: trivial cleanup
This commit is contained in:
commit
75827da103
3
.gitignore
vendored
3
.gitignore
vendored
@ -134,7 +134,6 @@
|
||||
/git-remote-ftps
|
||||
/git-remote-fd
|
||||
/git-remote-ext
|
||||
/git-remote-testpy
|
||||
/git-repack
|
||||
/git-replace
|
||||
/git-request-pull
|
||||
@ -147,11 +146,9 @@
|
||||
/git-rm
|
||||
/git-send-email
|
||||
/git-send-pack
|
||||
/git-serve
|
||||
/git-sh-i18n
|
||||
/git-sh-i18n--envsubst
|
||||
/git-sh-setup
|
||||
/git-sh-i18n
|
||||
/git-shell
|
||||
/git-shortlog
|
||||
/git-show
|
||||
|
19
refspec.c
19
refspec.c
@ -272,15 +272,16 @@ void refspec_ref_prefixes(const struct refspec *rs,
|
||||
else if (item->src && !item->exact_sha1)
|
||||
prefix = item->src;
|
||||
|
||||
if (prefix) {
|
||||
if (item->pattern) {
|
||||
const char *glob = strchr(prefix, '*');
|
||||
strvec_pushf(ref_prefixes, "%.*s",
|
||||
(int)(glob - prefix),
|
||||
prefix);
|
||||
} else {
|
||||
expand_ref_prefix(ref_prefixes, prefix);
|
||||
}
|
||||
if (!prefix)
|
||||
continue;
|
||||
|
||||
if (item->pattern) {
|
||||
const char *glob = strchr(prefix, '*');
|
||||
strvec_pushf(ref_prefixes, "%.*s",
|
||||
(int)(glob - prefix),
|
||||
prefix);
|
||||
} else {
|
||||
expand_ref_prefix(ref_prefixes, prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -906,7 +906,7 @@ test_expect_success '__git_refs - after --opt= - full refs' '
|
||||
test_cmp expected "$actual"
|
||||
'
|
||||
|
||||
test_expect_success '__git refs - exluding refs' '
|
||||
test_expect_success '__git refs - excluding refs' '
|
||||
cat >expected <<-EOF &&
|
||||
^HEAD
|
||||
^master
|
||||
@ -922,7 +922,7 @@ test_expect_success '__git refs - exluding refs' '
|
||||
test_cmp expected "$actual"
|
||||
'
|
||||
|
||||
test_expect_success '__git refs - exluding full refs' '
|
||||
test_expect_success '__git refs - excluding full refs' '
|
||||
cat >expected <<-EOF &&
|
||||
^refs/heads/master
|
||||
^refs/heads/matching-branch
|
||||
|
@ -955,7 +955,7 @@ test_expect_code () {
|
||||
# - cmp's output is not nearly as easy to read as diff -u
|
||||
# - not all diff versions understand "-u"
|
||||
|
||||
test_cmp() {
|
||||
test_cmp () {
|
||||
eval "$GIT_TEST_CMP" '"$@"'
|
||||
}
|
||||
|
||||
@ -968,7 +968,7 @@ test_cmp() {
|
||||
#
|
||||
# test_cmp_config foo core.bar
|
||||
#
|
||||
test_cmp_config() {
|
||||
test_cmp_config () {
|
||||
local GD &&
|
||||
if test "$1" = "-C"
|
||||
then
|
||||
@ -984,7 +984,7 @@ test_cmp_config() {
|
||||
|
||||
# test_cmp_bin - helper to compare binary files
|
||||
|
||||
test_cmp_bin() {
|
||||
test_cmp_bin () {
|
||||
cmp "$@"
|
||||
}
|
||||
|
||||
@ -1418,7 +1418,7 @@ nongit () {
|
||||
# whitespace and put in a single packet. Note that data containing NULs must be
|
||||
# given on stdin, and that empty input becomes an empty packet, not a flush
|
||||
# packet (for that you can just print 0000 yourself).
|
||||
packetize() {
|
||||
packetize () {
|
||||
if test $# -gt 0
|
||||
then
|
||||
packet="$*"
|
||||
|
Loading…
Reference in New Issue
Block a user