undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.6' into maint

Browse Source 
* 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:
Junio C Hamano 2010-02-16 15:05:02 -08:00
commit e7b3cea0f7
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -2893,6 +2893,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
; ;
else if (!prefixcmp(arg, "--output=")) { else if (!prefixcmp(arg, "--output=")) {
options->file = fopen(arg + strlen("--output="), "w"); options->file = fopen(arg + strlen("--output="), "w");
if (!options->file)
die_errno("Could not open '%s'", arg + strlen("--output="));
options->close_file = 1; options->close_file = 1;
} else } else
return 0; return 0;

7
git-stash.sh
View File

@ -221,6 +221,7 @@ show_stash () {
} }
apply_stash () { apply_stash () {
applied_stash=
unstash_index= unstash_index=
while test $# != 0 while test $# != 0
@ -242,6 +243,9 @@ apply_stash () {
if test $# = 0 if test $# = 0
then then
have_stash || die 'Nothing to apply' have_stash || die 'Nothing to apply'
applied_stash="$ref_stash@{0}"
else
applied_stash="$*"
fi fi
# stash records the work tree, and is a merge between the # stash records the work tree, and is a merge between the
@ -415,8 +419,7 @@ pop)
shift shift
if apply_stash "$@" if apply_stash "$@"
then then
test -z "$unstash_index" || shift drop_stash "$applied_stash"
drop_stash "$@"
fi fi
;; ;;
branch) branch)

2
git.c
View File

@ -527,7 +527,7 @@ int main(int argc, const char **argv)
break; break;
if (was_alias) { if (was_alias) {
fprintf(stderr, "Expansion of alias '%s' failed; " fprintf(stderr, "Expansion of alias '%s' failed; "
"'%s' is not a git-command\n", "'%s' is not a git command\n",
cmd, argv[0]); cmd, argv[0]);
exit(1); exit(1);
} }

2
help.c
View File

@ -350,7 +350,7 @@ const char *help_unknown_cmd(const char *cmd)
return assumed; 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)) { if (SIMILAR_ENOUGH(best_similarity)) {
fprintf(stderr, "\nDid you mean %s?\n", fprintf(stderr, "\nDid you mean %s?\n",

3
sha1_name.c
View File

@ -280,8 +280,7 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
*ref = xstrdup(r); *ref = xstrdup(r);
if (!warn_ambiguous_refs) if (!warn_ambiguous_refs)
break; break;
} else if ((flag & REF_ISSYMREF) && } else if ((flag & REF_ISSYMREF) && strcmp(fullref, "HEAD"))
(len != 4 || strcmp(str, "HEAD")))
warning("ignoring dangling symref %s.", fullref); warning("ignoring dangling symref %s.", fullref);
} }
free(last_branch); free(last_branch);

9
t/t3903-stash.sh
View File

@ -194,6 +194,15 @@ test_expect_success 'pop -q is quiet' '
test ! -s output.out 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' ' test_expect_success 'drop -q is quiet' '
git stash && git stash &&
git stash drop -q > output.out 2>&1 && git stash drop -q > output.out 2>&1 &&