Remove the large && { ... } form, as the block can be confused with a
function block. Use a simple if-condition instead. No functional
changes.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
git-pull.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index fb01763..babf009 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -195,7 +195,7 @@ error_on_no_merge_candidates () {
exit 1
}
-test true = "$rebase" && {
+if test true = "$rebase"; then
if ! git rev-parse -q --verify HEAD >/dev/null
then
# On an unborn branch
@@ -220,7 +220,8 @@ test true = "$rebase" && {
break
fi
done
-}
+fi
+
orig_head=$(git rev-parse -q --verify HEAD)
git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1
test -z "$dry_run" || exit 0
--
1.8.3.1.379.gb74074e.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html