git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Garrett Cooper <yaneurabeya@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to
Date: Tue, 2 Apr 2013 13:51:13 -0400	[thread overview]
Message-ID: <20130402175113.GD24698@sigill.intra.peff.net> (raw)
In-Reply-To: <A4C40BCB-85DD-4BCB-8BF0-79A75DE73211@gmail.com>

On Tue, Apr 02, 2013 at 10:30:35AM -0700, Garrett Cooper wrote:

> I push the branch to origin/ and then things tend to work, but since I
> obviously had been doing things wrong what's the correct order of
> operations for creating a branch and setting the upstream
> appropriately?

Once you have pushed it, the push creates the refs/remotes/origin/foo
tracking branch automatically. You are then free to reference it
wherever you like, including in set-upstream-to. However, you can also
just ask push to do it for you with "--set-upstream" or "-u". So the
workflow is something like:

  $ git checkout -b my-topic
  $ hack hack hack
  $ git commit -m "looking good, time to publish"
  $ git push -u origin HEAD

> PS I love git as a tool, but I really wish the workflows were simpler
> or more straightforward, and error messages were clearer. It seems
> like this would help prevent usage errors like this..

Things slowly improve as people make suggestions. I think the thing that
might have helped here is better advice when "set-upstream-to" is
pointed to a ref that does not exist.

Patches coming in a minute.

-Peff

  reply	other threads:[~2013-04-02 17:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-02 17:07 [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to Garrett Cooper
2013-04-02 17:23 ` Jeff King
2013-04-02 17:30   ` Garrett Cooper
2013-04-02 17:51     ` Jeff King [this message]
2013-04-02 19:01       ` [RFC/PATCH 0/5] branch --set-upstream-to error-message improvements Jeff King
2013-04-02 19:02         ` [PATCH 1/5] t3200: test --set-upstream-to with bogus refs Jeff King
2013-04-02 19:03         ` [PATCH 2/5] branch: factor out "upstream is not a branch" error messages Jeff King
2013-04-02 19:36           ` Garrett Cooper
2013-04-02 19:36             ` Garrett Cooper
2013-04-02 19:04         ` [PATCH 3/5] branch: improve error message for missing --set-upstream-to ref Jeff King
2013-04-02 19:04         ` [PATCH 4/5] branch: mention start_name in set-upstream error messages Jeff King
2013-04-02 19:39           ` Garrett Cooper
2013-04-02 19:05         ` [PATCH 5/5] branch: give advice when tracking start-point is missing Jeff King
2013-04-02 21:50         ` [RFC/PATCH 0/5] branch --set-upstream-to error-message improvements Junio C Hamano
2013-04-02 19:08     ` [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130402175113.GD24698@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=yaneurabeya@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).