From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Feb 2008 19:49:34 +0000 (-0800)
Subject: Sync with 1.5.4.3
X-Git-Tag: v1.5.5-rc0~160
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c?ds=inline;hp=-c

Sync with 1.5.4.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

923d44aeb7cb6d21eeb459fdc1b58137e37c2b1c
diff --combined Documentation/git.txt
index d57bed618f,17aee93ec5..741ae0e4c8
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,11 -43,9 +43,12 @@@ unreleased) version of git, that is ava
  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/git.html[documentation for release 1.5.4]
++* 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].
  
  * link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
diff --combined GIT-VERSION-GEN
index 1ad324e236,0d4c2f79c5..6ddf04d216
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.5.4.3.GIT
 +DEF_VER=v1.5.4.GIT
  
  LF='
  '
@@@ -16,7 -16,8 +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');
diff --combined git-gui/git-gui.sh
index 5d65272e26,04bd42576e..238a2393ff
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@@ -612,7 -612,6 +612,7 @@@ set default_config(gui.pruneduringfetch
  set default_config(gui.trustmtime) false
  set default_config(gui.diffcontext) 5
  set default_config(gui.newbranchtemplate) {}
 +set default_config(gui.spellingdictionary) {}
  set default_config(gui.fontui) [font configure font_ui]
  set default_config(gui.fontdiff) [font configure font_diff]
  set font_descs {
@@@ -663,7 -662,7 +663,7 @@@ if {![regsub {^git version } $_git_vers
  }
  
  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
@@@ -1684,7 -1683,6 +1684,7 @@@ set is_quitting 
  proc do_quit {} {
  	global ui_comm is_quitting repo_config commit_type
  	global GITGUI_BCK_exists GITGUI_BCK_i
 +	global ui_comm_spell
  
  	if {$is_quitting} return
  	set is_quitting 1
@@@ -1712,12 -1710,6 +1712,12 @@@
  			}
  		}
  
 +		# -- Cancel our spellchecker if its running.
 +		#
 +		if {[info exists ui_comm_spell]} {
 +			$ui_comm_spell stop
 +		}
 +
  		# -- Remove our editor backup, its not needed.
  		#
  		after cancel $GITGUI_BCK_i
@@@ -2462,7 -2454,7 +2462,7 @@@ $ctxm add separato
  $ctxm add command \
  	-label [mc "Sign Off"] \
  	-command do_signoff
 -bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
 +set ui_comm_ctxm $ctxm
  
  # -- Diff Header
  #
@@@ -2865,30 -2857,6 +2865,30 @@@ if {[winfo exists $ui_comm]} 
  	}
  
  	backup_commit_buffer
 +
 +	# -- If the user has aspell available we can drive it
 +	#    in pipe mode to spellcheck the commit message.
 +	#
 +	set spell_cmd [list |]
 +	set spell_dict [get_config gui.spellingdictionary]
 +	lappend spell_cmd aspell
 +	if {$spell_dict ne {}} {
 +		lappend spell_cmd --master=$spell_dict
 +	}
 +	lappend spell_cmd --mode=none
 +	lappend spell_cmd --encoding=utf-8
 +	lappend spell_cmd pipe
 +	if {$spell_dict eq {none}
 +	 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
 +		bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
 +	} else {
 +		set ui_comm_spell [spellcheck::init \
 +			$spell_fd \
 +			$ui_comm \
 +			$ui_comm_ctxm \
 +		]
 +	}
 +	unset -nocomplain spell_cmd spell_fd spell_err spell_dict
  }
  
  lock_index begin-read