git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/6] Fix git checkout - with rebase
Date: Thu, 13 Jun 2013 19:02:23 +0530	[thread overview]
Message-ID: <1371130349-30651-1-git-send-email-artagnon@gmail.com> (raw)

Hi,

I'm happy to report that I have found a reasonable solution
to the problem: see [5/6].

The larger problem still persists: in my opinion, b397ea4 takes the
wrong approach to the problem it is attempting to solve; nobody cares
_how_ I got to a detached HEAD state; what is important is that I'm
stuck in such a state and need useful information.

The correct approach, in my opinion, is already taken by my prompt:
use git describe.

  artagnon|checkout-dash=$ git checkout @~1
  artagnon|(checkout-dash~1):~/src/git$

Now compare this with the approach taken by the patch:

  artagnon|(checkout-dash~1):~/src/git$ git status
  # HEAD detached at 7aa7992
  nothing added to commit but untracked files present

Completely useless.

Unfortunately, it is too late to revert b397ea4, as too much stuff
already depends on it now (see builtin/branch.c for example).
Reworking the code to use describe is not an easy task at all:
describe has no exposed API, and is polluted with die() statements.
Nevertheless, it can be a fruitful exercise for someone who is willing
to take on the challenge.

Thanks.

Ramkumar Ramachandra (6):
  t/checkout-last: checkout - doesn't work after rebase
  rebase: prepare to write reflog message for checkout
  rebase -i: prepare to write reflog message for checkout
  wt-status: remove unused field in grab_1st_switch_cbdata
  status: do not depend on flaky reflog messages
  checkout: respect GIT_REFLOG_ACTION

 builtin/checkout.c         | 11 ++++++++---
 git-rebase--interactive.sh |  2 ++
 git-rebase.sh              |  2 ++
 t/t2012-checkout-last.sh   | 16 ++++++++++++++++
 t/t7512-status-help.sh     | 37 +++++++++++++++++--------------------
 wt-status.c                | 13 ++++---------
 6 files changed, 49 insertions(+), 32 deletions(-)

-- 
1.8.3.1.384.g7cec0b4

             reply	other threads:[~2013-06-13 13:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-13 13:32 Ramkumar Ramachandra [this message]
2013-06-13 13:32 ` [PATCH 1/6] t/checkout-last: checkout - doesn't work after rebase Ramkumar Ramachandra
2013-06-13 17:46   ` Junio C Hamano
2013-06-13 18:30     ` Ramkumar Ramachandra
2013-06-13 20:38       ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 2/6] rebase: prepare to write reflog message for checkout Ramkumar Ramachandra
2013-06-13 17:51   ` Junio C Hamano
2013-06-13 18:05     ` Ramkumar Ramachandra
2013-06-13 13:32 ` [PATCH 3/6] rebase -i: " Ramkumar Ramachandra
2013-06-13 17:52   ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 4/6] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-13 17:54   ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 5/6] status: do not depend on flaky reflog messages Ramkumar Ramachandra
2013-06-13 18:07   ` Junio C Hamano
2013-06-13 18:15     ` Ramkumar Ramachandra
2013-06-13 18:48     ` Ramkumar Ramachandra
2013-06-13 21:02       ` Junio C Hamano
2013-06-14  6:27         ` Ramkumar Ramachandra
2013-06-14 13:52           ` Junio C Hamano
2013-06-14 14:01             ` Ramkumar Ramachandra
2013-06-14 14:52               ` Junio C Hamano
2013-06-14 15:08                 ` Ramkumar Ramachandra
2013-06-14 16:31                   ` Junio C Hamano
2013-06-14 21:36                     ` Ramkumar Ramachandra
2013-06-14 22:16                       ` Junio C Hamano
2013-06-14 22:36                       ` Junio C Hamano
2013-06-14 23:07                         ` Junio C Hamano
2013-06-15  8:02                           ` Ramkumar Ramachandra
2013-06-15  9:58                             ` Junio C Hamano
2013-06-15 12:13                               ` Ramkumar Ramachandra
2013-06-15  8:44                         ` Ramkumar Ramachandra
2013-06-15  9:51                           ` Junio C Hamano
2013-06-15 12:08                             ` Ramkumar Ramachandra
2013-06-16  5:57                               ` Junio C Hamano
2013-06-16  6:07                                 ` Ramkumar Ramachandra
2013-06-15 10:26                           ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 6/6] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra

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=1371130349-30651-1-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).