Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15
STALE3751d

[PATCH 0/2] Allow tags as upstreams for --track

From: Michael J Gruber <hidden>
Date: 2016-06-15 22:46:44

I sent this patch during rc without a test and it received the
appropriate reaction ;)

Now, comes with test and all that...

This is about using tags as the upstream for --track (checkout,
branch). Currently, git allows to do that but all status generating
commands (status, checkout, branch -v) barf when the upstream is not a
commit, such as an annotated tag. So, either we should disallow this or
deal with it. The latter is actually easier, sometimes useful and does
not harm any living creatures.

The first patch exposes the issue by 2 tests: lightweight tags are OK,
annotated tags are not.

The second patch teaches stat_tracking_info() to resolve a reference to
a commit before using it.

Tags as upstreams can be useful because then branch -vv gives you concise
information about how much work you have done say on top of a released
version, in case where the "behind" information with respect to a branch
would be less informative (Where did I fork?) and confusing (Behind?
What do you mean behind for a branch on top of a released version?).

Michael J Gruber (2):
  Test tracking of non-commit upstreams
  Fix behavior with non-committish upstream references

 remote.c                 |    4 ++--
 t/t6040-tracking-info.sh |   14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help