From ae6d4aeb89ce87d5474f49cd180cfefc205262a2 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Tue, 13 Mar 2012 11:48:37 +0100
Subject: g push/status: use @{upstream} instead of origin

origin won't work if origin/HEAD points to nowhere, which is a valid
use-case.
---
 g | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'g')

diff --git a/g b/g
index 5b39c462ef74..11ecaa607cbd 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
-- 
cgit v1.2.3