From: Paul Mackerras <paulus@samba.org>
Date: Sun, 11 May 2008 00:50:14 +0000 (+1000)
Subject: Merge branch 'master' into dev
X-Git-Tag: v1.5.6-rc0~20^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8a0c69b91747c2934f6ede4fef174b85b59aede;p=git.git

Merge branch 'master' into dev
---

e8a0c69b91747c2934f6ede4fef174b85b59aede
diff --cc gitk
index 5f27c6ac4,a1eccfc6d..4b7b01985
--- a/gitk
+++ b/gitk
@@@ -9678,8 -8791,43 +9843,9 @@@ if {$i >= [llength $argv] && $revtreear
      }
  }
  
 -if {$mergeonly} {
 -    # find the list of unmerged files
 -    set mlist {}
 -    set nr_unmerged 0
 -    if {[catch {
 -	set fd [open "| git ls-files -u" r]
 -    } err]} {
 -	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
 -	exit 1
 -    }
 -    while {[gets $fd line] >= 0} {
 -	set i [string first "\t" $line]
 -	if {$i < 0} continue
 -	set fname [string range $line [expr {$i+1}] end]
 -	if {[lsearch -exact $mlist $fname] >= 0} continue
 -	incr nr_unmerged
 -	if {$cmdline_files eq {} || [path_filter $cmdline_files $fname]} {
 -	    lappend mlist $fname
 -	}
 -    }
 -    catch {close $fd}
 -    if {$mlist eq {}} {
 -	if {$nr_unmerged == 0} {
 -	    show_error {} . [mc "No files selected: --merge specified but\
 -			     no files are unmerged."]
 -	} else {
 -	    show_error {} . [mc "No files selected: --merge specified but\
 -			     no unmerged files are within file limit."]
 -	}
 -	exit 1
 -    }
 -    set cmdline_files $mlist
 -}
 -
  set nullid "0000000000000000000000000000000000000000"
  set nullid2 "0000000000000000000000000000000000000001"
+ set nullfile "/dev/null"
  
  set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]