From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Apr 2009 08:17:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~39
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/81aa96497686bd31c5a9a3cdf110c2e10c799c03?ds=inline;hp=-c

Merge branch 'maint'

* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
---

81aa96497686bd31c5a9a3cdf110c2e10c799c03
diff --combined git-repack.sh
index 1782a23b26,00c597e97c..0868734723
--- a/git-repack.sh
+++ b/git-repack.sh
@@@ -60,7 -60,6 +60,7 @@@ case ",$all_into_one," i
  	args='--unpacked --incremental'
  	;;
  ,t,)
 +	args= existing=
  	if [ -d "$PACKDIR" ]; then
  		for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
  			| sed -e 's/^\.\///' -e 's/\.pack$//'`
@@@ -68,10 -67,11 +68,10 @@@
  			if [ -e "$PACKDIR/$e.keep" ]; then
  				: keep
  			else
 -				args="$args --unpacked=$e.pack"
  				existing="$existing $e"
  			fi
  		done
 -		if test -n "$args" -a -n "$unpack_unreachable" -a \
 +		if test -n "$existing" -a -n "$unpack_unreachable" -a \
  			-n "$remove_redundant"
  		then
  			args="$args $unpack_unreachable"
@@@ -181,5 -181,5 +181,5 @@@ f
  
  case "$no_update_info" in
  t) : ;;
- *) git-update-server-info ;;
+ *) git update-server-info ;;
  esac