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

Merge branch 'maint'

Browse Source 
* maint:
  unquote_c_style: fix off-by-one.
  test-lib: fix TERM to dumb for test repeatability
  config.txt: refer to --upload-pack and --receive-pack instead of --exec
  git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
This commit is contained in:
Junio C Hamano 2008-03-07 22:43:46 -08:00
commit 60e3cad92e
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/config.txt
View File

@ -896,15 +896,15 @@ remote.<name>.skipDefaultUpdate::
remote.<name>.receivepack:: remote.<name>.receivepack::
The default program to execute on the remote side when pushing. See The default program to execute on the remote side when pushing. See
option \--exec of linkgit:git-push[1]. option \--receive-pack of linkgit:git-push[1].
remote.<name>.uploadpack:: remote.<name>.uploadpack::
The default program to execute on the remote side when fetching. See The default program to execute on the remote side when fetching. See
option \--exec of linkgit:git-fetch-pack[1]. option \--upload-pack of linkgit:git-fetch-pack[1].
remote.<name>.tagopt:: remote.<name>.tagopt::
Setting this value to --no-tags disables automatic tag following when fetching Setting this value to \--no-tags disables automatic tag following when
from remote <name> fetching from remote <name>
remotes.<group>:: remotes.<group>::
The list of remotes which are fetched by "git remote update The list of remotes which are fetched by "git remote update

5
git-gui/Makefile
View File

@ -224,6 +224,11 @@ else
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127) ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
MSGFMT := $(TCL_PATH) po/po2msg.sh MSGFMT := $(TCL_PATH) po/po2msg.sh
endif endif
ifeq (msgfmt,$(MSGFMT))
ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null || echo $?),1)
MSGFMT := $(TCL_PATH) po/po2msg.sh
endif
endif
endif endif
msgsdir = $(gg_libdir)/msgs msgsdir = $(gg_libdir)/msgs

2
quote.c
View File

@ -288,7 +288,7 @@ int unquote_c_style(struct strbuf *sb, const char *quoted, const char **endp)
switch (*quoted++) { switch (*quoted++) {
case '"': case '"':
if (endp) if (endp)
*endp = quoted + 1; *endp = quoted;
return 0; return 0;
case '\\': case '\\':
break; break;

18
t/test-lib.sh
View File

@ -3,12 +3,16 @@
# Copyright (c) 2005 Junio C Hamano # Copyright (c) 2005 Junio C Hamano
# #
# Keep the original TERM for say_color
ORIGINAL_TERM=$TERM
# For repeatability, reset the environment to known value. # For repeatability, reset the environment to known value.
LANG=C LANG=C
LC_ALL=C LC_ALL=C
PAGER=cat PAGER=cat
TZ=UTC TZ=UTC
export LANG LC_ALL PAGER TZ TERM=dumb
export LANG LC_ALL PAGER TERM TZ
EDITOR=: EDITOR=:
VISUAL=: VISUAL=:
unset GIT_EDITOR unset GIT_EDITOR
@ -58,12 +62,14 @@ esac
# This test checks if command xyzzy does the right thing... # This test checks if command xyzzy does the right thing...
# ' # '
# . ./test-lib.sh # . ./test-lib.sh
[ "x$ORIGINAL_TERM" != "xdumb" ] && (
[ "x$TERM" != "xdumb" ] && TERM=$ORIGINAL_TERM &&
export TERM &&
[ -t 1 ] && [ -t 1 ] &&
tput bold >/dev/null 2>&1 && tput bold >/dev/null 2>&1 &&
tput setaf 1 >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1 &&
tput sgr0 >/dev/null 2>&1 && tput sgr0 >/dev/null 2>&1
) &&
color=t color=t
while test "$#" -ne 0 while test "$#" -ne 0
@ -91,6 +97,9 @@ done
if test -n "$color"; then if test -n "$color"; then
say_color () { say_color () {
(
TERM=$ORIGINAL_TERM
export TERM
case "$1" in case "$1" in
error) tput bold; tput setaf 1;; # bold red error) tput bold; tput setaf 1;; # bold red
skip) tput bold; tput setaf 2;; # bold green skip) tput bold; tput setaf 2;; # bold green
@ -101,6 +110,7 @@ if test -n "$color"; then
shift shift
echo "* $*" echo "* $*"
tput sgr0 tput sgr0
)
} }
else else
say_color() { say_color() {