зеркало из https://github.com/microsoft/git.git
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught Remove hyphen from "git-command" in two error messages
This commit is contained in:
Коммит
e7b3cea0f7
2
diff.c
2
diff.c
|
@ -2893,6 +2893,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
;
|
||||
else if (!prefixcmp(arg, "--output=")) {
|
||||
options->file = fopen(arg + strlen("--output="), "w");
|
||||
if (!options->file)
|
||||
die_errno("Could not open '%s'", arg + strlen("--output="));
|
||||
options->close_file = 1;
|
||||
} else
|
||||
return 0;
|
||||
|
|
|
@ -221,6 +221,7 @@ show_stash () {
|
|||
}
|
||||
|
||||
apply_stash () {
|
||||
applied_stash=
|
||||
unstash_index=
|
||||
|
||||
while test $# != 0
|
||||
|
@ -242,6 +243,9 @@ apply_stash () {
|
|||
if test $# = 0
|
||||
then
|
||||
have_stash || die 'Nothing to apply'
|
||||
applied_stash="$ref_stash@{0}"
|
||||
else
|
||||
applied_stash="$*"
|
||||
fi
|
||||
|
||||
# stash records the work tree, and is a merge between the
|
||||
|
@ -415,8 +419,7 @@ pop)
|
|||
shift
|
||||
if apply_stash "$@"
|
||||
then
|
||||
test -z "$unstash_index" || shift
|
||||
drop_stash "$@"
|
||||
drop_stash "$applied_stash"
|
||||
fi
|
||||
;;
|
||||
branch)
|
||||
|
|
2
git.c
2
git.c
|
@ -527,7 +527,7 @@ int main(int argc, const char **argv)
|
|||
break;
|
||||
if (was_alias) {
|
||||
fprintf(stderr, "Expansion of alias '%s' failed; "
|
||||
"'%s' is not a git-command\n",
|
||||
"'%s' is not a git command\n",
|
||||
cmd, argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
|
2
help.c
2
help.c
|
@ -350,7 +350,7 @@ const char *help_unknown_cmd(const char *cmd)
|
|||
return assumed;
|
||||
}
|
||||
|
||||
fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd);
|
||||
fprintf(stderr, "git: '%s' is not a git command. See 'git --help'.\n", cmd);
|
||||
|
||||
if (SIMILAR_ENOUGH(best_similarity)) {
|
||||
fprintf(stderr, "\nDid you mean %s?\n",
|
||||
|
|
|
@ -280,8 +280,7 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
|
|||
*ref = xstrdup(r);
|
||||
if (!warn_ambiguous_refs)
|
||||
break;
|
||||
} else if ((flag & REF_ISSYMREF) &&
|
||||
(len != 4 || strcmp(str, "HEAD")))
|
||||
} else if ((flag & REF_ISSYMREF) && strcmp(fullref, "HEAD"))
|
||||
warning("ignoring dangling symref %s.", fullref);
|
||||
}
|
||||
free(last_branch);
|
||||
|
|
|
@ -194,6 +194,15 @@ test_expect_success 'pop -q is quiet' '
|
|||
test ! -s output.out
|
||||
'
|
||||
|
||||
test_expect_success 'pop -q --index works and is quiet' '
|
||||
echo foo > file &&
|
||||
git add file &&
|
||||
git stash save --quiet &&
|
||||
git stash pop -q --index > output.out 2>&1 &&
|
||||
test foo = "$(git show :file)" &&
|
||||
test ! -s output.out
|
||||
'
|
||||
|
||||
test_expect_success 'drop -q is quiet' '
|
||||
git stash &&
|
||||
git stash drop -q > output.out 2>&1 &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче