Merge branch 'master' of git://repo.or.cz/git-gui

Junio C Hamano · Junio C Hamano · commit ea4494960578 · 2007-02-13T13:48:52.000-08:00
* 'master' of git://repo.or.cz/git-gui:
  git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"
diff --git a/git-gui/GIT-VERSION-GEN b/git-gui/GIT-VERSION-GEN
@@ -10,7 +10,7 @@ tree_search ()
 {
 	head=$1
 	tree=$2
-	for p in $(git rev-list --parents --max-count=1 $head 2>/devnull)
+	for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
 	do
 		test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
 		vn=$(git describe --abbrev=4 $p 2>/dev/null) &&

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ tree_search ()`
`10`	`10`	`{`
`11`	`11`	`head=$1`
`12`	`12`	`tree=$2`
`13`		`- for p in $(git rev-list --parents --max-count=1 $head 2>/devnull)`
	`13`	`+ for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)`
`14`	`14`	`do`
`15`	`15`	`test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&`
`16`	`16`	`vn=$(git describe --abbrev=4 $p 2>/dev/null) &&`