2007-09-11 05:19:34 +02:00
|
|
|
/*
|
|
|
|
|
* "git reset" builtin command
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2007 Carlos Rica
|
|
|
|
|
*
|
|
|
|
|
* Based on git-reset.sh, which is
|
|
|
|
|
*
|
|
|
|
|
* Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
|
|
|
|
|
*/
|
Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 08:51:05 +01:00
|
|
|
#include "builtin.h"
|
2007-09-11 05:19:34 +02:00
|
|
|
#include "tag.h"
|
|
|
|
|
#include "object.h"
|
|
|
|
|
#include "commit.h"
|
|
|
|
|
#include "run-command.h"
|
|
|
|
|
#include "refs.h"
|
|
|
|
|
#include "diff.h"
|
|
|
|
|
#include "diffcore.h"
|
|
|
|
|
#include "tree.h"
|
2008-02-07 17:40:16 +01:00
|
|
|
#include "branch.h"
|
2008-03-04 23:11:34 +01:00
|
|
|
#include "parse-options.h"
|
2009-12-30 06:54:47 +01:00
|
|
|
#include "unpack-trees.h"
|
|
|
|
|
#include "cache-tree.h"
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2008-03-04 23:11:34 +01:00
|
|
|
static const char * const git_reset_usage[] = {
|
2010-01-19 05:25:57 +01:00
|
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]",
|
2010-03-31 11:24:19 +02:00
|
|
|
"git reset [-q] <commit> [--] <paths>...",
|
|
|
|
|
"git reset --patch [<commit>] [--] [<paths>...]",
|
2008-03-04 23:11:34 +01:00
|
|
|
NULL
|
|
|
|
|
};
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2010-01-19 05:25:57 +01:00
|
|
|
enum reset_type { MIXED, SOFT, HARD, MERGE, KEEP, NONE };
|
|
|
|
|
static const char *reset_type_names[] = {
|
2011-02-23 00:42:07 +01:00
|
|
|
N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
|
2010-01-19 05:25:57 +01:00
|
|
|
};
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
static inline int is_merge(void)
|
|
|
|
|
{
|
|
|
|
|
return !access(git_path("MERGE_HEAD"), F_OK);
|
|
|
|
|
}
|
|
|
|
|
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet)
|
2007-09-11 05:19:34 +02:00
|
|
|
{
|
2009-12-30 06:54:47 +01:00
|
|
|
int nr = 1;
|
|
|
|
|
int newfd;
|
|
|
|
|
struct tree_desc desc[2];
|
2011-12-06 18:43:39 +01:00
|
|
|
struct tree *tree;
|
2009-12-30 06:54:47 +01:00
|
|
|
struct unpack_trees_options opts;
|
|
|
|
|
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2009-12-30 06:54:47 +01:00
|
|
|
memset(&opts, 0, sizeof(opts));
|
|
|
|
|
opts.head_idx = 1;
|
|
|
|
|
opts.src_index = &the_index;
|
|
|
|
|
opts.dst_index = &the_index;
|
|
|
|
|
opts.fn = oneway_merge;
|
|
|
|
|
opts.merge = 1;
|
2008-06-01 03:10:58 +02:00
|
|
|
if (!quiet)
|
2009-12-30 06:54:47 +01:00
|
|
|
opts.verbose_update = 1;
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
switch (reset_type) {
|
2010-01-19 05:25:57 +01:00
|
|
|
case KEEP:
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
case MERGE:
|
2009-12-30 06:54:47 +01:00
|
|
|
opts.update = 1;
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
break;
|
|
|
|
|
case HARD:
|
2009-12-30 06:54:47 +01:00
|
|
|
opts.update = 1;
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
/* fallthrough */
|
|
|
|
|
default:
|
2009-12-30 06:54:47 +01:00
|
|
|
opts.reset = 1;
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
}
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2009-12-30 06:54:47 +01:00
|
|
|
newfd = hold_locked_index(lock, 1);
|
|
|
|
|
|
|
|
|
|
read_cache_unmerged();
|
|
|
|
|
|
2010-01-19 05:25:57 +01:00
|
|
|
if (reset_type == KEEP) {
|
|
|
|
|
unsigned char head_sha1[20];
|
|
|
|
|
if (get_sha1("HEAD", head_sha1))
|
2011-02-23 00:42:06 +01:00
|
|
|
return error(_("You do not have a valid HEAD."));
|
2010-01-19 05:25:57 +01:00
|
|
|
if (!fill_tree_descriptor(desc, head_sha1))
|
2011-02-23 00:42:06 +01:00
|
|
|
return error(_("Failed to find tree of HEAD."));
|
2010-01-19 05:25:57 +01:00
|
|
|
nr++;
|
|
|
|
|
opts.fn = twoway_merge;
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-30 06:54:47 +01:00
|
|
|
if (!fill_tree_descriptor(desc + nr - 1, sha1))
|
2011-02-23 00:42:06 +01:00
|
|
|
return error(_("Failed to find tree of %s."), sha1_to_hex(sha1));
|
2009-12-30 06:54:47 +01:00
|
|
|
if (unpack_trees(nr, desc, &opts))
|
|
|
|
|
return -1;
|
2011-12-06 18:43:39 +01:00
|
|
|
|
|
|
|
|
if (reset_type == MIXED || reset_type == HARD) {
|
|
|
|
|
tree = parse_tree_indirect(sha1);
|
|
|
|
|
prime_cache_tree(&active_cache_tree, tree);
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-30 06:54:47 +01:00
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
|
|
|
|
commit_locked_index(lock))
|
2011-02-23 00:42:06 +01:00
|
|
|
return error(_("Could not write new index file."));
|
2009-12-30 06:54:47 +01:00
|
|
|
|
|
|
|
|
return 0;
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void print_new_head_line(struct commit *commit)
|
|
|
|
|
{
|
2008-03-02 08:43:32 +01:00
|
|
|
const char *hex, *body;
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
|
2011-02-23 00:42:06 +01:00
|
|
|
printf(_("HEAD is now at %s"), hex);
|
2007-09-11 05:19:34 +02:00
|
|
|
body = strstr(commit->buffer, "\n\n");
|
|
|
|
|
if (body) {
|
|
|
|
|
const char *eol;
|
|
|
|
|
size_t len;
|
|
|
|
|
body += 2;
|
|
|
|
|
eol = strchr(body, '\n');
|
|
|
|
|
len = eol ? eol - body : strlen(body);
|
|
|
|
|
printf(" %.*s\n", (int) len, body);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
printf("\n");
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-25 22:49:08 +02:00
|
|
|
static int update_index_refresh(int fd, struct lock_file *index_lock, int flags)
|
2007-09-11 05:19:34 +02:00
|
|
|
{
|
2007-11-03 16:21:21 +01:00
|
|
|
int result;
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2007-11-03 16:21:21 +01:00
|
|
|
if (!index_lock) {
|
|
|
|
|
index_lock = xcalloc(1, sizeof(struct lock_file));
|
|
|
|
|
fd = hold_locked_index(index_lock, 1);
|
|
|
|
|
}
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2007-11-03 16:21:21 +01:00
|
|
|
if (read_cache() < 0)
|
2011-02-23 00:42:06 +01:00
|
|
|
return error(_("Could not read index"));
|
2008-07-25 22:49:08 +02:00
|
|
|
|
2009-08-21 10:57:59 +02:00
|
|
|
result = refresh_index(&the_index, (flags), NULL, NULL,
|
2011-02-23 00:42:08 +01:00
|
|
|
_("Unstaged changes after reset:")) ? 1 : 0;
|
2007-11-03 16:21:21 +01:00
|
|
|
if (write_cache(fd, active_cache, active_nr) ||
|
|
|
|
|
commit_locked_index(index_lock))
|
|
|
|
|
return error ("Could not refresh index");
|
|
|
|
|
return result;
|
|
|
|
|
}
|
2007-11-03 14:12:17 +01:00
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
static void update_index_from_diff(struct diff_queue_struct *q,
|
|
|
|
|
struct diff_options *opt, void *data)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2007-11-03 16:21:21 +01:00
|
|
|
int *discard_flag = data;
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
/* do_diff_cache() mangled the index */
|
|
|
|
|
discard_cache();
|
2007-11-03 16:21:21 +01:00
|
|
|
*discard_flag = 1;
|
2007-09-11 05:19:34 +02:00
|
|
|
read_cache();
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < q->nr; i++) {
|
|
|
|
|
struct diff_filespec *one = q->queue[i]->one;
|
2011-07-14 06:36:29 +02:00
|
|
|
if (one->mode && !is_null_sha1(one->sha1)) {
|
2007-09-11 05:19:34 +02:00
|
|
|
struct cache_entry *ce;
|
|
|
|
|
ce = make_cache_entry(one->mode, one->sha1, one->path,
|
|
|
|
|
0, 0);
|
2008-10-05 04:14:40 +02:00
|
|
|
if (!ce)
|
2011-02-23 00:42:06 +01:00
|
|
|
die(_("make_cache_entry failed for path '%s'"),
|
2008-10-05 04:14:40 +02:00
|
|
|
one->path);
|
2007-09-11 05:19:34 +02:00
|
|
|
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
|
|
|
|
|
ADD_CACHE_OK_TO_REPLACE);
|
|
|
|
|
} else
|
|
|
|
|
remove_file_from_cache(one->path);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-08-15 13:48:31 +02:00
|
|
|
static int interactive_reset(const char *revision, const char **argv,
|
|
|
|
|
const char *prefix)
|
|
|
|
|
{
|
|
|
|
|
const char **pathspec = NULL;
|
|
|
|
|
|
|
|
|
|
if (*argv)
|
|
|
|
|
pathspec = get_pathspec(prefix, argv);
|
|
|
|
|
|
|
|
|
|
return run_add_interactive(revision, "--patch=reset", pathspec);
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
static int read_from_tree(const char *prefix, const char **argv,
|
2008-07-25 22:49:08 +02:00
|
|
|
unsigned char *tree_sha1, int refresh_flags)
|
2007-09-11 05:19:34 +02:00
|
|
|
{
|
2007-11-03 16:21:21 +01:00
|
|
|
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
|
|
|
|
|
int index_fd, index_was_discarded = 0;
|
2007-09-11 05:19:34 +02:00
|
|
|
struct diff_options opt;
|
|
|
|
|
|
|
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
|
diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt);
|
|
|
|
|
opt.output_format = DIFF_FORMAT_CALLBACK;
|
|
|
|
|
opt.format_callback = update_index_from_diff;
|
2007-11-03 16:21:21 +01:00
|
|
|
opt.format_callback_data = &index_was_discarded;
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2007-11-03 16:21:21 +01:00
|
|
|
index_fd = hold_locked_index(lock, 1);
|
|
|
|
|
index_was_discarded = 0;
|
2007-09-11 05:19:34 +02:00
|
|
|
read_cache();
|
|
|
|
|
if (do_diff_cache(tree_sha1, &opt))
|
|
|
|
|
return 1;
|
|
|
|
|
diffcore_std(&opt);
|
|
|
|
|
diff_flush(&opt);
|
2007-12-11 22:59:55 +01:00
|
|
|
diff_tree_release_paths(&opt);
|
2007-11-03 14:12:17 +01:00
|
|
|
|
2007-11-03 16:21:21 +01:00
|
|
|
if (!index_was_discarded)
|
|
|
|
|
/* The index is still clobbered from do_diff_cache() */
|
|
|
|
|
discard_cache();
|
2008-07-25 22:49:08 +02:00
|
|
|
return update_index_refresh(index_fd, lock, refresh_flags);
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
static void set_reflog_message(struct strbuf *sb, const char *action,
|
|
|
|
|
const char *rev)
|
2007-09-11 05:19:34 +02:00
|
|
|
{
|
|
|
|
|
const char *rla = getenv("GIT_REFLOG_ACTION");
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
|
|
|
|
|
strbuf_reset(sb);
|
|
|
|
|
if (rla)
|
|
|
|
|
strbuf_addf(sb, "%s: %s", rla, action);
|
|
|
|
|
else if (rev)
|
|
|
|
|
strbuf_addf(sb, "reset: moving to %s", rev);
|
|
|
|
|
else
|
|
|
|
|
strbuf_addf(sb, "reset: %s", action);
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
|
2010-01-19 05:26:01 +01:00
|
|
|
static void die_if_unmerged_cache(int reset_type)
|
|
|
|
|
{
|
|
|
|
|
if (is_merge() || read_cache() < 0 || unmerged_cache())
|
2011-02-23 00:42:07 +01:00
|
|
|
die(_("Cannot do a %s reset in the middle of a merge."),
|
|
|
|
|
_(reset_type_names[reset_type]));
|
2010-01-19 05:26:01 +01:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
int cmd_reset(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
2008-03-04 23:11:34 +01:00
|
|
|
int i = 0, reset_type = NONE, update_ref_status = 0, quiet = 0;
|
2009-08-15 13:48:31 +02:00
|
|
|
int patch_mode = 0;
|
2007-09-11 05:19:34 +02:00
|
|
|
const char *rev = "HEAD";
|
|
|
|
|
unsigned char sha1[20], *orig = NULL, sha1_orig[20],
|
|
|
|
|
*old_orig = NULL, sha1_old_orig[20];
|
|
|
|
|
struct commit *commit;
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
struct strbuf msg = STRBUF_INIT;
|
2008-03-04 23:11:34 +01:00
|
|
|
const struct option options[] = {
|
2010-11-08 20:54:48 +01:00
|
|
|
OPT__QUIET(&quiet, "be quiet, only report errors"),
|
2008-03-04 23:11:34 +01:00
|
|
|
OPT_SET_INT(0, "mixed", &reset_type,
|
|
|
|
|
"reset HEAD and index", MIXED),
|
|
|
|
|
OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
|
|
|
|
|
OPT_SET_INT(0, "hard", &reset_type,
|
|
|
|
|
"reset HEAD, index and working tree", HARD),
|
Add 'merge' mode to 'git reset'
We have always had a nice way to reset a working tree to another state
while carrying our changes around: "git read-tree -u -m". Yes, it fails if
the target tree is different in the paths that are dirty in the working
tree, but this is how we used to switch branches in "git checkout", and it
worked fine.
However, perhaps exactly _because_ we've supported this from very early
on, another low-level command, namely "git reset", never did.
But as time went on, 'git reset' remains as a very common command, while
'git read-tree' is now a very odd and low-level plumbing thing that nobody
sane should ever use, because it only makes sense together with other
operations like either switching branches or just rewriting HEAD.
Which means that we have effectively lost the ability to do something very
common: jump to another point in time without always dropping all our
dirty state.
So add this kind of mode to "git reset", and since it merges your changes
to what you are resetting to, just call it that: "git reset --merge".
I've wanted this for a long time, since I very commonly carry a dirty
tree while working on things. My main 'Makefile' file quite often has the
next version already modified, and sometimes I have local modifications
that I don't want to commit, but I still do pulls and patch applications,
and occasionally want to do "git reset" to undo them - while still keeping
my local modifications.
(Maybe we could eventually change it to something like "if we have a
working tree, default to --merge, otherwise default to --mixed").
NOTE! This new mode is certainly not perfect. There's a few things to look
out for:
- if the index has unmerged entries, "--merge" will currently simply
refuse to reset ("you need to resolve your current index first").
You'll need to use "--hard" or similar in this case.
This is sad, because normally a unmerged index means that the working
tree file should have matched the source tree, so the correct action is
likely to make --merge reset such a path to the target (like --hard),
regardless of dirty state in-tree or in-index. But that's not how
read-tree has ever worked, so..
- "git checkout -m" actually knows how to do a three-way merge, rather
than refuse to update the working tree. So we do know how to do that,
and arguably that would be even nicer behavior.
At the same time it's also arguably true that there is a chance of loss
of state (ie you cannot get back to the original tree if the three-way
merge ends up resolving cleanly to no diff at all), so the "refuse to
do it" is in some respects the safer - but less user-friendly - option.
In other words, I think 'git reset --merge' could become a bit more
friendly, but this is already a big improvement. It allows you to undo a
recent commit without having to throw your current work away.
Yes, yes, with a dirty tree you could always do
git stash
git reset --hard
git stash apply
instead, but isn't "git reset --merge" a nice way to handle one particular
simple case?
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
--
Hmm? Maybe I'm the only one that does a lot of work with a dirty tree, and
sure, I can do other things like the "git stash" thing, or using "git
checkout" to actually create a new branch, and then playing games with
branch renaming etc to make it work like this one.
But I suspect others dislike how "git reset" works too. But see the
suggested improvements above.
builtin-reset.c | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
2008-12-01 18:30:31 +01:00
|
|
|
OPT_SET_INT(0, "merge", &reset_type,
|
|
|
|
|
"reset HEAD, index and working tree", MERGE),
|
2010-01-19 05:25:57 +01:00
|
|
|
OPT_SET_INT(0, "keep", &reset_type,
|
|
|
|
|
"reset HEAD but keep local changes", KEEP),
|
2009-08-15 13:48:31 +02:00
|
|
|
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
|
2008-03-04 23:11:34 +01:00
|
|
|
OPT_END()
|
|
|
|
|
};
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
git_config(git_default_config, NULL);
|
2007-09-11 05:19:34 +02:00
|
|
|
|
2009-05-23 20:53:12 +02:00
|
|
|
argc = parse_options(argc, argv, prefix, options, git_reset_usage,
|
2008-03-04 23:11:34 +01:00
|
|
|
PARSE_OPT_KEEP_DASHDASH);
|
2007-09-11 05:19:34 +02:00
|
|
|
|
Allow "git-reset path" when unambiguous
Resetting a selected set of index entries is done with
"git reset -- paths" syntax, but we did not allow -- to be omitted
even when the command is unambiguous.
This updates the command to follow the general rule:
* When -- appears, revs come before it, and paths come after it;
* When there is no --, earlier ones are revs and the rest are paths, and
we need to guess. When lack of -- marker forces us to guess, we
protect from user errors and typoes by making sure what we treat as
revs do not appear as filenames in the work tree, and what we treat as
paths do appear as filenames in the work tree, and by erroring out if
that is not the case. We tell the user to disambiguate by using -- in
such a case.
which is employed elsewhere in the system.
When this rule is applied to "reset", because we can have only zero or one
rev to the command, the check can be slightly simpler than other programs.
We have to check only the first one or two tokens after the command name
and options, and when they are:
-- A:
no explicit rev given; "A" and whatever follows it are paths.
A --:
explicit rev "A" given and whatever follows the "--" are paths.
A B:
"A" could be rev or path and we need to guess. "B" could
be missing but if exists that (and everything that follows) would
be paths.
So we apply the guess only in the last case and only to "A" (not "B" and
what comes after it).
* As long as "A" is unambiguously a path, index entries for "A", "B" (and
everything that follows) are reset to the HEAD revision.
* If "A" is unambiguously a rev, on the other hand, the index entries for
"B" (and everything that follows) are reset to the "A" revision.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-26 03:16:36 +02:00
|
|
|
/*
|
|
|
|
|
* Possible arguments are:
|
|
|
|
|
*
|
|
|
|
|
* git reset [-opts] <rev> <paths>...
|
|
|
|
|
* git reset [-opts] <rev> -- <paths>...
|
|
|
|
|
* git reset [-opts] -- <paths>...
|
|
|
|
|
* git reset [-opts] <paths>...
|
|
|
|
|
*
|
|
|
|
|
* At this point, argv[i] points immediately after [-opts].
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
if (i < argc) {
|
|
|
|
|
if (!strcmp(argv[i], "--")) {
|
|
|
|
|
i++; /* reset to HEAD, possibly with paths */
|
|
|
|
|
} else if (i + 1 < argc && !strcmp(argv[i+1], "--")) {
|
|
|
|
|
rev = argv[i];
|
|
|
|
|
i += 2;
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* Otherwise, argv[i] could be either <rev> or <paths> and
|
2009-04-17 20:13:30 +02:00
|
|
|
* has to be unambiguous.
|
Allow "git-reset path" when unambiguous
Resetting a selected set of index entries is done with
"git reset -- paths" syntax, but we did not allow -- to be omitted
even when the command is unambiguous.
This updates the command to follow the general rule:
* When -- appears, revs come before it, and paths come after it;
* When there is no --, earlier ones are revs and the rest are paths, and
we need to guess. When lack of -- marker forces us to guess, we
protect from user errors and typoes by making sure what we treat as
revs do not appear as filenames in the work tree, and what we treat as
paths do appear as filenames in the work tree, and by erroring out if
that is not the case. We tell the user to disambiguate by using -- in
such a case.
which is employed elsewhere in the system.
When this rule is applied to "reset", because we can have only zero or one
rev to the command, the check can be slightly simpler than other programs.
We have to check only the first one or two tokens after the command name
and options, and when they are:
-- A:
no explicit rev given; "A" and whatever follows it are paths.
A --:
explicit rev "A" given and whatever follows the "--" are paths.
A B:
"A" could be rev or path and we need to guess. "B" could
be missing but if exists that (and everything that follows) would
be paths.
So we apply the guess only in the last case and only to "A" (not "B" and
what comes after it).
* As long as "A" is unambiguously a path, index entries for "A", "B" (and
everything that follows) are reset to the HEAD revision.
* If "A" is unambiguously a rev, on the other hand, the index entries for
"B" (and everything that follows) are reset to the "A" revision.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-26 03:16:36 +02:00
|
|
|
*/
|
|
|
|
|
else if (!get_sha1(argv[i], sha1)) {
|
|
|
|
|
/*
|
|
|
|
|
* Ok, argv[i] looks like a rev; it should not
|
|
|
|
|
* be a filename.
|
|
|
|
|
*/
|
|
|
|
|
verify_non_filename(prefix, argv[i]);
|
|
|
|
|
rev = argv[i++];
|
|
|
|
|
} else {
|
|
|
|
|
/* Otherwise we treat this as a filename */
|
2012-06-18 20:18:21 +02:00
|
|
|
verify_filename(prefix, argv[i], 1);
|
Allow "git-reset path" when unambiguous
Resetting a selected set of index entries is done with
"git reset -- paths" syntax, but we did not allow -- to be omitted
even when the command is unambiguous.
This updates the command to follow the general rule:
* When -- appears, revs come before it, and paths come after it;
* When there is no --, earlier ones are revs and the rest are paths, and
we need to guess. When lack of -- marker forces us to guess, we
protect from user errors and typoes by making sure what we treat as
revs do not appear as filenames in the work tree, and what we treat as
paths do appear as filenames in the work tree, and by erroring out if
that is not the case. We tell the user to disambiguate by using -- in
such a case.
which is employed elsewhere in the system.
When this rule is applied to "reset", because we can have only zero or one
rev to the command, the check can be slightly simpler than other programs.
We have to check only the first one or two tokens after the command name
and options, and when they are:
-- A:
no explicit rev given; "A" and whatever follows it are paths.
A --:
explicit rev "A" given and whatever follows the "--" are paths.
A B:
"A" could be rev or path and we need to guess. "B" could
be missing but if exists that (and everything that follows) would
be paths.
So we apply the guess only in the last case and only to "A" (not "B" and
what comes after it).
* As long as "A" is unambiguously a path, index entries for "A", "B" (and
everything that follows) are reset to the HEAD revision.
* If "A" is unambiguously a rev, on the other hand, the index entries for
"B" (and everything that follows) are reset to the "A" revision.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-26 03:16:36 +02:00
|
|
|
}
|
|
|
|
|
}
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
if (get_sha1(rev, sha1))
|
2011-02-23 00:42:06 +01:00
|
|
|
die(_("Failed to resolve '%s' as a valid ref."), rev);
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
commit = lookup_commit_reference(sha1);
|
|
|
|
|
if (!commit)
|
2011-02-23 00:42:06 +01:00
|
|
|
die(_("Could not parse object '%s'."), rev);
|
2007-09-11 05:19:34 +02:00
|
|
|
hashcpy(sha1, commit->object.sha1);
|
|
|
|
|
|
2009-08-15 13:48:31 +02:00
|
|
|
if (patch_mode) {
|
|
|
|
|
if (reset_type != NONE)
|
2011-02-23 00:42:06 +01:00
|
|
|
die(_("--patch is incompatible with --{hard,mixed,soft}"));
|
2009-08-15 13:48:31 +02:00
|
|
|
return interactive_reset(rev, argv + i, prefix);
|
|
|
|
|
}
|
|
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
/* git reset tree [--] paths... can be used to
|
|
|
|
|
* load chosen paths from the tree into the index without
|
|
|
|
|
* affecting the working tree nor HEAD. */
|
|
|
|
|
if (i < argc) {
|
|
|
|
|
if (reset_type == MIXED)
|
2011-02-23 00:42:06 +01:00
|
|
|
warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead."));
|
2007-09-11 05:19:34 +02:00
|
|
|
else if (reset_type != NONE)
|
2011-02-23 00:42:07 +01:00
|
|
|
die(_("Cannot do %s reset with paths."),
|
|
|
|
|
_(reset_type_names[reset_type]));
|
2008-07-25 22:49:08 +02:00
|
|
|
return read_from_tree(prefix, argv + i, sha1,
|
2009-08-21 10:57:58 +02:00
|
|
|
quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
if (reset_type == NONE)
|
|
|
|
|
reset_type = MIXED; /* by default */
|
|
|
|
|
|
2010-01-19 05:26:00 +01:00
|
|
|
if (reset_type != SOFT && reset_type != MIXED)
|
2009-12-30 09:47:03 +01:00
|
|
|
setup_work_tree();
|
2007-12-31 08:13:52 +01:00
|
|
|
|
2009-12-30 06:54:44 +01:00
|
|
|
if (reset_type == MIXED && is_bare_repository())
|
2011-02-23 00:42:07 +01:00
|
|
|
die(_("%s reset is not allowed in a bare repository"),
|
|
|
|
|
_(reset_type_names[reset_type]));
|
2009-12-30 06:54:44 +01:00
|
|
|
|
2007-09-11 05:19:34 +02:00
|
|
|
/* Soft reset does not touch the index file nor the working tree
|
|
|
|
|
* at all, but requires them in a good order. Other resets reset
|
|
|
|
|
* the index file to the tree object we are switching to. */
|
2010-01-19 05:26:01 +01:00
|
|
|
if (reset_type == SOFT)
|
|
|
|
|
die_if_unmerged_cache(reset_type);
|
|
|
|
|
else {
|
|
|
|
|
int err;
|
|
|
|
|
if (reset_type == KEEP)
|
|
|
|
|
die_if_unmerged_cache(reset_type);
|
|
|
|
|
err = reset_index_file(sha1, reset_type, quiet);
|
2010-01-19 05:25:57 +01:00
|
|
|
if (reset_type == KEEP)
|
|
|
|
|
err = err || reset_index_file(sha1, MIXED, quiet);
|
|
|
|
|
if (err)
|
2011-02-23 00:42:06 +01:00
|
|
|
die(_("Could not reset index file to revision '%s'."), rev);
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Any resets update HEAD to the head being switched to,
|
|
|
|
|
* saving the previous head in ORIG_HEAD before. */
|
|
|
|
|
if (!get_sha1("ORIG_HEAD", sha1_old_orig))
|
|
|
|
|
old_orig = sha1_old_orig;
|
|
|
|
|
if (!get_sha1("HEAD", sha1_orig)) {
|
|
|
|
|
orig = sha1_orig;
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
|
|
|
|
|
update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR);
|
2007-09-11 05:19:34 +02:00
|
|
|
}
|
|
|
|
|
else if (old_orig)
|
2008-10-26 03:33:56 +01:00
|
|
|
delete_ref("ORIG_HEAD", old_orig, 0);
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
set_reflog_message(&msg, "updating HEAD", rev);
|
|
|
|
|
update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, MSG_ON_ERR);
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
switch (reset_type) {
|
|
|
|
|
case HARD:
|
2007-11-04 10:37:20 +01:00
|
|
|
if (!update_ref_status && !quiet)
|
2007-09-11 05:19:34 +02:00
|
|
|
print_new_head_line(commit);
|
|
|
|
|
break;
|
|
|
|
|
case SOFT: /* Nothing else to do. */
|
|
|
|
|
break;
|
|
|
|
|
case MIXED: /* Report what has not been updated. */
|
2008-07-25 22:49:08 +02:00
|
|
|
update_index_refresh(0, NULL,
|
2009-08-21 10:57:58 +02:00
|
|
|
quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
|
2007-09-11 05:19:34 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-07 17:40:16 +01:00
|
|
|
remove_branch_state();
|
2007-09-11 05:19:34 +02:00
|
|
|
|
reset: give better reflog messages
The reset command creates its reflog entry from argv.
However, it does so after having run parse_options, which
means the only thing left in argv is any non-option
arguments. Thus you would end up with confusing reflog
entries like:
$ git reset --hard HEAD^
$ git reset --soft HEAD@{1}
$ git log -2 -g --oneline
8e46cad HEAD@{0}: HEAD@{1}: updating HEAD
1eb9486 HEAD@{1}: HEAD^: updating HEAD
However, we must also consider that some scripts may set
GIT_REFLOG_ACTION before calling reset, and we need to show
their reflog action (with our text appended). For example:
rebase -i (squash): updating HEAD
On top of that, we also set the ORIG_HEAD reflog action
(even though it doesn't generally exist). In that case, the
reset argument is somewhat meaningless, as it has nothing to
do with what's in ORIG_HEAD.
This patch changes the reset reflog code to show:
$GIT_REFLOG_ACTION: updating {HEAD,ORIG_HEAD}
as before, but only if GIT_REFLOG_ACTION is set. Otherwise,
show:
reset: moving to $rev
for HEAD, and:
reset: updating ORIG_HEAD
for ORIG_HEAD (this is still somewhat superfluous, since we
are in the ORIG_HEAD reflog, obviously, but at least we now
mention which command was used to update it).
While we're at it, we can clean up the code a bit:
- Use strbufs to make the message.
- Use the "rev" parameter instead of showing all options.
This makes more sense, since it is the only thing
impacting the writing of the ref.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-07-22 18:12:23 +02:00
|
|
|
strbuf_release(&msg);
|
2007-09-11 05:19:34 +02:00
|
|
|
|
|
|
|
|
return update_ref_status;
|
|
|
|
|
}
|