[Libreoffice-commits] .: g

[Miklos Vajna]

 g |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ae6d4aeb89ce87d5474f49cd180cfefc205262a2
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Mar 13 11:48:37 2012 +0100

    g push/status: use @{upstream} instead of origin
    
    origin won't work if origin/HEAD points to nowhere, which is a valid
    use-case.

diff --git a/g b/g
index 5b39c46..11ecaa6 100755
--- a/g
+++ b/g
@@ -321,11 +321,11 @@ for REPO in $DIRS ; do
                     ;;
                 push)
                     if [ "$PUSH_ALL" != "1" ] ; then
-                        [ -n "$(git rev-list origin..HEAD)" ] || exit 0
+                        [ -n "$(git rev-list @{upstream}..HEAD)" ] || exit 0
                     fi
                     ;;
                 status)
-                    LOCALCOMMITS="$(git rev-list origin..HEAD)"
+                    LOCALCOMMITS="$(git rev-list @{upstream}..HEAD)"
                     if [ -z "$LOCALCOMMITS" ] ; then
                         [ -z "$(git diff-index --name-only HEAD --)" ] && exit 0
                     fi