undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/random-cleanup'

Browse Source 
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:
Junio C Hamano 2020-12-08 15:11:21 -08:00
commit 75827da103
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -134,7 +134,6 @@
/git-remote-ftps /git-remote-ftps
/git-remote-fd /git-remote-fd
/git-remote-ext /git-remote-ext
/git-remote-testpy
/git-repack /git-repack
/git-replace /git-replace
/git-request-pull /git-request-pull
@ -147,11 +146,9 @@
/git-rm /git-rm
/git-send-email /git-send-email
/git-send-pack /git-send-pack
/git-serve
/git-sh-i18n /git-sh-i18n
/git-sh-i18n--envsubst /git-sh-i18n--envsubst
/git-sh-setup /git-sh-setup
/git-sh-i18n
/git-shell /git-shell
/git-shortlog /git-shortlog
/git-show /git-show

5
refspec.c
View File

@ -272,7 +272,9 @@ void refspec_ref_prefixes(const struct refspec *rs,
else if (item->src && !item->exact_sha1) else if (item->src && !item->exact_sha1)
prefix = item->src; prefix = item->src;
if (prefix) { if (!prefix)
continue;
if (item->pattern) { if (item->pattern) {
const char *glob = strchr(prefix, '*'); const char *glob = strchr(prefix, '*');
strvec_pushf(ref_prefixes, "%.*s", strvec_pushf(ref_prefixes, "%.*s",
@ -282,5 +284,4 @@ void refspec_ref_prefixes(const struct refspec *rs,
expand_ref_prefix(ref_prefixes, prefix); expand_ref_prefix(ref_prefixes, prefix);
} }
} }
}
} }

4
t/t9902-completion.sh
View File

@ -906,7 +906,7 @@ test_expect_success '__git_refs - after --opt= - full refs' '
test_cmp expected "$actual" test_cmp expected "$actual"
' '
test_expect_success '__git refs - exluding refs' ' test_expect_success '__git refs - excluding refs' '
cat >expected <<-EOF && cat >expected <<-EOF &&
^HEAD ^HEAD
^master ^master
@ -922,7 +922,7 @@ test_expect_success '__git refs - exluding refs' '
test_cmp expected "$actual" test_cmp expected "$actual"
' '
test_expect_success '__git refs - exluding full refs' ' test_expect_success '__git refs - excluding full refs' '
cat >expected <<-EOF && cat >expected <<-EOF &&
^refs/heads/master ^refs/heads/master
^refs/heads/matching-branch ^refs/heads/matching-branch

8
t/test-lib-functions.sh
View File

@ -955,7 +955,7 @@ test_expect_code () {
# - cmp's output is not nearly as easy to read as diff -u # - cmp's output is not nearly as easy to read as diff -u
# - not all diff versions understand "-u" # - not all diff versions understand "-u"
test_cmp() { test_cmp () {
eval "$GIT_TEST_CMP" '"$@"' eval "$GIT_TEST_CMP" '"$@"'
} }
@ -968,7 +968,7 @@ test_cmp() {
# #
# test_cmp_config foo core.bar # test_cmp_config foo core.bar
# #
test_cmp_config() { test_cmp_config () {
local GD && local GD &&
if test "$1" = "-C" if test "$1" = "-C"
then then
@ -984,7 +984,7 @@ test_cmp_config() {
# test_cmp_bin - helper to compare binary files # test_cmp_bin - helper to compare binary files
test_cmp_bin() { test_cmp_bin () {
cmp "$@" cmp "$@"
} }
@ -1418,7 +1418,7 @@ nongit () {
# whitespace and put in a single packet. Note that data containing NULs must be # 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 # given on stdin, and that empty input becomes an empty packet, not a flush
# packet (for that you can just print 0000 yourself). # packet (for that you can just print 0000 yourself).
packetize() { packetize () {
if test $# -gt 0 if test $# -gt 0
then then
packet="$*" packet="$*"