Recover the old behavior of the remote branch name
... specified in $_git/branches/$name and defaulting to master.
Signed-off-by: Santi Béjar <sbejar@gmail.com> ---
cg-pull | 2 +- cg-push | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −2
cg-pull, cg-push
diff --git a/cg-pull b/cg-pull --- a/cg-pull +++ b/cg-pull @@ -249,7 +249,7 @@ name=${ARGS[0]} [ "$name" ] || die "where to pull from?" uri=$(cat "$_git/branches/$name" 2>/dev/null) || die "unknown branch: $name" -rembranch=$_git_head +rembranch=master if echo "$uri" | grep -q '#'; then rembranch=$(echo $uri | cut -d '#' -f 2) uri=$(echo $uri | cut -d '#' -f 1) diff --git a/cg-push b/cg-push --- a/cg-push +++ b/cg-push @@ -26,7 +26,7 @@ name=${ARGS[0]} [ "$name" ] || die "where to push from?" uri=$(cat "$_git/branches/$name" 2>/dev/null) || die "unknown branch: $name" -rembranch=$_git_head +rembranch=master if echo "$uri" | grep -q '#'; then rembranch=$(echo $uri | cut -d '#' -f 2) uri=$(echo $uri | cut -d '#' -f 1)