delta/git.git/git-checkout.sh, branch jk/external-diff-use-argv-array

Build in checkout

2008-02-16T23:05:02+00:00

The only differences in behavior should be:

 - git checkout -m with non-trivial merging won't print out
   merge-recursive messages (see the change in t7201-co.sh)

 - git checkout -- paths... will give a sensible error message if
   HEAD is invalid as a commit.

 - some intermediate states which were written to disk in the shell
   version (in particular, index states) are only kept in memory in
   this version, and therefore these can no longer be revealed by
   later write operations becoming impossible.

 - when we change branches, we discard MERGE_MSG, SQUASH_MSG, and
   rr-cache/MERGE_RR, like reset always has.

I'm not 100% sure I got the merge recursive setup exactly right; the
base for a non-trivial merge in the shell code doesn't seem
theoretically justified to me, but I tried to match it anyway, and the
tests all pass this way.

Other than these items, the results should be identical to the shell
version, so far as I can tell.

[jc: squashed lock-file fix from Dscho in]

Signed-off-by: Daniel Barkalow 
Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

Fix a typo in checkout.sh and cleanup one-line help messages

2007-12-11T17:52:44+00:00

This also shortens option descriptions to fit in 80 columns.

Signed-off-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

git checkout's reflog: even when detaching the HEAD, say from where

2007-11-29T00:20:13+00:00

When checking out another ref, the reflogs already record from which
branch you switched.  Do that also when switching to a detached HEAD.

While at it, record also when coming _from_ a detached HEAD.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-11-26T03:10:01+00:00

* maint:
  user-manual: recovering from corruption
  user-manual: clarify language about "modifying" old commits
  user-manual: failed push to public repository
  user-manual: define "branch" and "working tree" at start
  git-checkout: describe detached head correctly

git-checkout: describe detached head correctly

2007-11-25T18:38:22+00:00

When you have a file called HEAD in the work tree, the code to report
where the HEAD is at when "git checkout $commit^0" is done triggered
unnecessary ambiguity checking.

Explicitly mark the command line with "--" and make it clear that we are
talking about a revision.

Signed-off-by: Junio C Hamano

Merge branch 'ds/checkout-upper'

2007-11-19T00:04:17+00:00

* ds/checkout-upper:
  git-checkout: Test for relative path use.
  git-checkout: Support relative paths containing "..".

git-checkout: Support relative paths containing "..".

2007-11-12T01:00:07+00:00

Signed-off-by: David Symonds 
Signed-off-by: Junio C Hamano

Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash

2007-11-06T06:48:13+00:00

Also fix some space versus tabs issues.

Signed-off-by: Junio C Hamano

post-checkout hook, tests, and docs

2007-09-30T04:11:21+00:00

Updated post-checkout hook to take a flag specifying whether the checkout is
a branch checkout or a file checkout (from the index).

Signed-off-by: Josh England 
Signed-off-by: Junio C Hamano

Alter git-checkout reflog message to include "from" branch

2007-07-04T19:56:02+00:00

As suggested by Junio, adding the current branch name to the
reflog message for git-checkout would be helpful.  For example:

   "checkout: moving from next to master"

Signed-off-by: Sean Estabrooks 
Signed-off-by: Junio C Hamano