delta/git.git/git-reset.sh, branch ws/curl-http-proxy-over-https

Make "git reset" a builtin.

2007-09-12T20:25:07+00:00

This replaces the script "git-reset.sh" with "builtin-reset.c".

A few git commands used in the script are called from the builtin also:
"ls-files" to check for unmerged files, "read-tree" for resetting
the index file in "mixed" and "hard" resets, and "update-index" to
refresh at the end in the "mixed" reset and also for the option that
gets selected paths into the index.

The reset option with paths was implemented by Johannes Schindelin.

Since the option that gets selected paths into the index is not
a "reset" like the others because it does not change the HEAD at all,
now the command is showing a warning when the "--mixed" option
is supplied for that purpose.

The following table shows the behaviour of "git reset" for
the different supported options, where X means "changing"
the HEAD, index or working tree:

reset:  --soft  --mixed  --hard  -- 
HEAD       X       X        X        -
index      -       X        X        X
files      -       -        X        -

Signed-off-by: Carlos Rica 
Signed-off-by: Junio C Hamano

Rewrite "git-frotz" to "git frotz"

2007-07-03T05:52:14+00:00

This uses the remove-dashes target to replace "git-frotz" to "git frotz".

Signed-off-by: Junio C Hamano

add file checkout progress

2007-04-24T04:39:28+00:00

It is nice to see what is happening when checking out large amount of
files, either with git-checkout or git-reset.  The new progress code
already decides what is a "significant amount" and displays progress
only in that case..

Signed-off-by: Nicolas Pitre 
Signed-off-by: Junio C Hamano

Shell syntax fix in git-reset

2007-01-18T22:22:24+00:00

Signed-off-by: Junio C Hamano

Replace "echo -n" with printf in shell scripts.

2007-01-16T06:23:21+00:00

Not all echos know -n.  This was causing a test failure in
t5401-update-hooks.sh, but not t3800-mktag.sh for some reason.

Signed-off-by: Jason Riedy 
Signed-off-by: Junio C Hamano

Use cd_to_toplevel in scripts that implement it by hand.

2007-01-13T00:54:38+00:00

This converts scripts that do "cd $(rev-parse --show-cdup)" by
hand to use cd_to_toplevel.

I think git-fetch does not have to go to the toplevel, but that
should be dealt with in a separate patch.

Signed-off-by: Junio C Hamano

Disallow working directory commands in a bare repository.

2007-01-10T23:03:09+00:00

If the user tries to run a porcelainish command which requires
a working directory in a bare repository they may get unexpected
results which are difficult to predict and may differ from command
to command.

Instead we should detect that the current repository is a bare
repository and refuse to run the command there, as there is no
working directory associated with it.

[jc: updated Shawn's original somewhat -- bugs are mine.]

Signed-off-by: Shawn O. Pearce 
Signed-off-by: Junio C Hamano

git-reset -- restores absense of in

2007-01-07T06:57:42+00:00

When  exists in the index (either merged or unmerged), and
 does not have it, git-reset should be usable to restore
the absense of it from the tree.  This implements it.

Signed-off-by: Junio C Hamano

Honor GIT_REFLOG_ACTION in git-rebase.

2006-12-28T09:05:45+00:00

To help correctly log actions caused by porcelain which invoke
git-reset directly we should honor the setting of GIT_REFLOG_ACTION
which we inherited from our caller.

Signed-off-by: Shawn O. Pearce 
Signed-off-by: Junio C Hamano

git-reset --hard: tell the user what the HEAD was reset to

2006-12-22T06:47:49+00:00

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