summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-25 08:27:53 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-09-25 08:27:53 -0700
commitc9c6cc8d7db312b9e8502f8d55422b8309cde2f3 (patch)
treef13048eaaa0dd450171d2bce68ebe17e7c3a1847 /git.c
parentbaede9f803ff7becab815481b004bc983d0422c7 (diff)
parent93feb4bb14dbd5c89701d6f2b0ab3d83dbc999c5 (diff)
downloadgit-c9c6cc8d7db312b9e8502f8d55422b8309cde2f3.tar.gz
Merge branch 'maint'
* maint: Update release notes for 1.6.0.3 checkout: Do not show local changes when in quiet mode for-each-ref: Fix --format=%(subject) for log message without newlines git-stash.sh: don't default to refs/stash if invalid ref supplied maint: check return of split_cmdline to avoid bad config strings
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/git.c b/git.c
index 905acc2f2c..00f5dd1d49 100644
--- a/git.c
+++ b/git.c
@@ -162,6 +162,8 @@ static int handle_alias(int *argcp, const char ***argv)
alias_string + 1, alias_command);
}
count = split_cmdline(alias_string, &new_argv);
+ if (count < 0)
+ die("Bad alias.%s string", alias_command);
option_count = handle_options(&new_argv, &count, &envchanged);
if (envchanged)
die("alias '%s' changes environment variables\n"