[PATCH 3/3] push: don't push the volatile HEAD with current

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: May 21, 2013, 18:23 UTC
Message-ID: <1369160600-22337-4-git-send-email-artagnon@gmail.com>
In-Reply-To: <1369160600-22337-1-git-send-email-artagnon@gmail.com>

Since a push does not lock the "HEAD" ref, there is no guarantee that it will remain the same for the entire operation of the push. Practically, this means that with push.default set to current:

  # on branch push-current-head
  $ git push
  # on another terminal
  $ git checkout master
  # return to the first terminal
  # the push tried to push master!

Avoid this confusion by adding the branch that HEAD resolves to as the refspec to push (as opposed to the literal "HEAD"). With this change, the output of the push changes subtly from:

  $ git push
  ...
   * [new branch]      HEAD -> push-current-head

to:

  $ git push
  ...
   * [new branch]      push-current-head -> push-current-head

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 builtin/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/push.c b/builtin/push.c
index a79038c..d819487 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -198,7 +198,7 @@ static void setup_default_push_refspecs(struct remote *remote)
 	case PUSH_DEFAULT_CURRENT:
 		if (!branch)
 			die(_(message_detached_head_die), remote->name);
-		add_refspec("HEAD");
+		add_refspec(branch->name);
 		break;
 
 	case PUSH_DEFAULT_NOTHING:

-- 
1.8.3.rc3.7.gc1ff30b