Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
reset: suggest what to do upon "git reset --mixed <paths>"
author
Ævar Arnfjörð Bjarmason
<avarab@gmail.com>
Sun, 15 Aug 2010 08:43:20 +0000
(08:43 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 22 Aug 2010 06:17:35 +0000
(23:17 -0700)
When you call "git reset --mixed <paths>" git will warn that using mixed
with paths is deprecated:
warning: --mixed option is deprecated with paths.
That doesn't tell the user what he should use instead. Expand on the
warning and tell the user to just omit --mixed:
warning: --mixed with paths is deprecated; use 'git reset -- <paths>' instead
The exact wording of the warning was suggested by Jonathan Nieder.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reset.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
452c6d5
)
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 1283068fd24c371e39f0271d01dd6b3aac437d4b..0037be4693bbd875e644df13ce4a9fae31e7378c 100644
(file)
--- a/
builtin/reset.c
+++ b/
builtin/reset.c
@@
-318,7
+318,7
@@
int cmd_reset(int argc, const char **argv, const char *prefix)
* affecting the working tree nor HEAD. */
if (i < argc) {
if (reset_type == MIXED)
* affecting the working tree nor HEAD. */
if (i < argc) {
if (reset_type == MIXED)
- warning("--mixed
option is deprecated with paths
.");
+ warning("--mixed
with paths is deprecated; use 'git reset -- <paths>' instead
.");
else if (reset_type != NONE)
die("Cannot do %s reset with paths.",
reset_type_names[reset_type]);
else if (reset_type != NONE)
die("Cannot do %s reset with paths.",
reset_type_names[reset_type]);