Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
923d44ae
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
923d44ae
编写于
2月 23, 2008
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with 1.5.4.3
Signed-off-by:
N
Junio C Hamano
<
gitster@pobox.com
>
上级
0d2dd191
31e0b2ca
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
67 addition
and
12 deletion
+67
-12
Documentation/RelNotes-1.5.4.3.txt
Documentation/RelNotes-1.5.4.3.txt
+27
-0
Documentation/git.txt
Documentation/git.txt
+2
-1
GIT-VERSION-GEN
GIT-VERSION-GEN
+2
-1
git-gui/Makefile
git-gui/Makefile
+16
-2
git-gui/git-gui.sh
git-gui/git-gui.sh
+1
-1
git-gui/lib/choose_repository.tcl
git-gui/lib/choose_repository.tcl
+4
-0
git-gui/lib/error.tcl
git-gui/lib/error.tcl
+15
-7
未找到文件。
Documentation/RelNotes-1.5.4.3.txt
0 → 100644
浏览文件 @
923d44ae
GIT v1.5.4.3 Release Notes
==========================
Fixes since v1.5.4.2
--------------------
* RPM spec used to pull in everything with 'git'. This has been
changed so that 'git' package contains just the core parts,
and we now supply 'git-all' metapackage to slurp in everything.
This should match end user's expectation better.
* When some refs failed to update, git-push reported "failure"
which was unclear if some other refs were updated or all of
them failed atomically (the answer is the former). Reworded
the message to clarify this.
* "git clone" from a repository whose HEAD was misconfigured
did not set up the remote properly. Now it tries to do
better.
* Updated git-push documentation to clarify what "matching"
means, in order to reduce user confusion.
* Updated git-add documentation to clarify "add -u" operates in
the current subdirectory you are in, just like other commands.
* git-gui updates to work on OSX and Windows better.
Documentation/git.txt
浏览文件 @
923d44ae
...
...
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.5.4.
2/git.html[documentation for release 1.5.4.2
]
* link:v1.5.4.
3/git.html[documentation for release 1.5.4.3
]
* release notes for
link:RelNotes-1.5.4.3.txt[1.5.4.3],
link:RelNotes-1.5.4.2.txt[1.5.4.2],
link:RelNotes-1.5.4.1.txt[1.5.4.1],
link:RelNotes-1.5.4.txt[1.5.4].
...
...
GIT-VERSION-GEN
浏览文件 @
923d44ae
...
...
@@ -16,7 +16,8 @@ elif test -d .git &&
case
"
$VN
"
in
*
$LF
*
)
(
exit
1
)
;;
v[0-9]
*
)
git diff-index
--quiet
HEAD
||
VN
=
"
$VN
-dirty"
;;
test
-z
"
$(
git diff-index
--name-only
HEAD
)
"
||
VN
=
"
$VN
-dirty"
;;
esac
then
VN
=
$(
echo
"
$VN
"
|
sed
-e
's/-/./g'
)
;
...
...
git-gui/Makefile
浏览文件 @
923d44ae
...
...
@@ -92,8 +92,12 @@ ifndef V
REMOVE_F1
=
&&
echo
' '
REMOVE
`
basename
"
$$
dst"
`
&&
$(RM_RF)
"
$$
dst"
endif
TCL_PATH
?=
tclsh
TCLTK_PATH
?=
wish
ifeq
(./,$(dir $(TCLTK_PATH)))
TCL_PATH
?=
$(
subst
wish,tclsh,
$(TCLTK_PATH)
)
else
TCL_PATH
?=
$(
dir
$(TCLTK_PATH)
)$(
notdir
$(
subst
wish,tclsh,
$(TCLTK_PATH)
))
endif
ifeq
($(uname_S),Darwin)
TKFRAMEWORK
=
/Library/Frameworks/Tk.framework/Resources/Wish.app
...
...
@@ -127,7 +131,17 @@ GITGUI_MACOSXAPP :=
ifeq
($(uname_O),Cygwin)
GITGUI_SCRIPT
:=
`cygpath --windows --absolute "
$(GITGUI_SCRIPT)
"`
gg_libdir_sed_in
:=
$(
shell
cygpath --windows --absolute "
$(gg_libdir)
"
)
# Is this a Cygwin Tcl/Tk binary? If so it knows how to do
# POSIX path translation just like cygpath does and we must
# keep libdir in POSIX format so Cygwin packages of git-gui
# work no matter where the user installs them.
#
ifeq
($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
gg_libdir_sed_in
:=
$(gg_libdir)
else
gg_libdir_sed_in
:=
$(
shell
cygpath --windows --absolute "
$(gg_libdir)
"
)
endif
else
ifeq
($(exedir),$(gg_libdir))
GITGUI_RELATIVE
:=
1
...
...
git-gui/git-gui.sh
浏览文件 @
923d44ae
...
...
@@ -663,7 +663,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
}
set _real_git_version
$_git_version
regsub -- {
-
dirty
$}
$_git_version
{} _git_version
regsub -- {
[
\-\.
]
dirty
$}
$_git_version
{} _git_version
regsub {
\.
[0-9]+
\.
g[0-9a-f]+
$}
$_git_version
{} _git_version
regsub {
\.
rc[0-9]+
$}
$_git_version
{} _git_version
regsub {
\.
GIT
$}
$_git_version
{} _git_version
...
...
git-gui/lib/choose_repository.tcl
浏览文件 @
923d44ae
...
...
@@ -11,6 +11,7 @@ field w_quit ; # Quit button
field o_cons
;
# Console object
(
if active
)
field w_types
;
# List of type buttons in clone
field w_recentlist
;
# Listbox containing recent repositories
field w_localpath
;
# Entry widget bound to local_path
field done 0
;
# Finished picking the repository?
field local_path
{}
;
# Where this repository is locally
...
...
@@ -385,6 +386,7 @@ method _do_new {} {
button $w_body.where.b
\
-text
[
mc
"Browse"
]
\
-command
[
cb _new_local_path
]
set w_localpath $w_body.where.t
pack $w_body.where.b -side right
pack $w_body.where.l -side left
...
...
@@ -416,6 +418,7 @@ method _new_local_path {} {
return
}
set local_path $p
$w
_localpath icursor end
}
method _do_new2
{}
{
...
...
@@ -481,6 +484,7 @@ method _do_clone {} {
-text
[
mc
"Browse"
]
\
-command
[
cb _new_local_path
]
grid $args.where_l $args.where_t $args.where_b -sticky ew
set w_localpath $args.where_t
label $args.type_l -text
[
mc
"Clone Type:"
]
frame $args.type_f
...
...
git-gui/lib/error.tcl
浏览文件 @
923d44ae
# git-gui branch
(
create/delete
)
support
# Copyright
(
C
)
2006, 2007 Shawn Pearce
proc _error_parent
{}
{
set p
[
grab current .
]
if
{
$p
eq
{}}
{
return .
}
return $p
}
proc error_popup
{
msg
}
{
set title
[
appname
]
if
{[
reponame
]
ne
{}}
{
...
...
@@ -11,8 +19,8 @@ proc error_popup {msg} {
-type ok
\
-title
[
append
"
$title:
"
[
mc
"error"
]]
\
-message $msg
]
if
{[
winfo ismapped
.
]}
{
lappend cmd -parent
.
if
{[
winfo ismapped
[
_error_parent
]
]}
{
lappend cmd -parent
[
_error_parent
]
}
eval $cmd
}
...
...
@@ -27,13 +35,13 @@ proc warn_popup {msg} {
-type ok
\
-title
[
append
"
$title:
"
[
mc
"warning"
]]
\
-message $msg
]
if
{[
winfo ismapped
.
]}
{
lappend cmd -parent
.
if
{[
winfo ismapped
[
_error_parent
]
]}
{
lappend cmd -parent
[
_error_parent
]
}
eval $cmd
}
proc info_popup
{
msg
{
parent .
}
}
{
proc info_popup
{
msg
}
{
set title
[
appname
]
if
{[
reponame
]
ne
{}}
{
append title
" (
[
reponame
]
)"
...
...
@@ -56,8 +64,8 @@ proc ask_popup {msg} {
-type yesno
\
-title $title
\
-message $msg
]
if
{[
winfo ismapped
.
]}
{
lappend cmd -parent
.
if
{[
winfo ismapped
[
_error_parent
]
]}
{
lappend cmd -parent
[
_error_parent
]
}
eval $cmd
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录