Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  Better usage string for reflog.
  hg-to-git: don't import the unused popen2 module
  send-email: remove debug trace
  config: Keep inner whitespace verbatim
This commit is contained in:
Junio C Hamano 2009-08-05 12:37:24 -07:00
commit f0df1293ac
5 changed files with 11 additions and 9 deletions

View File

@ -694,7 +694,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
*/
static const char reflog_usage[] =
"git reflog (expire | ...)";
"git reflog [ show | expire | delete ]";
int cmd_reflog(int argc, const char **argv, const char *prefix)
{

View File

@ -62,7 +62,8 @@ static char *parse_value(void)
if (comment)
continue;
if (isspace(c) && !quote) {
space = 1;
if (len)
space++;
continue;
}
if (!quote) {
@ -71,11 +72,8 @@ static char *parse_value(void)
continue;
}
}
if (space) {
if (len)
value[len++] = ' ';
space = 0;
}
for (; space; space--)
value[len++] = ' ';
if (c == '\\') {
c = get_next_char();
switch (c) {

View File

@ -20,7 +20,7 @@
"""
import os, os.path, sys
import tempfile, popen2, pickle, getopt
import tempfile, pickle, getopt
import re
# Maps hg version -> git version

View File

@ -450,7 +450,6 @@ sub check_file_rev_conflict($) {
try {
$repo->command('rev-parse', '--verify', '--quiet', $f);
if (defined($format_patch)) {
print "foo\n";
return $format_patch;
}
die(<<EOF);

View File

@ -755,6 +755,11 @@ echo >>result
test_expect_success '--null --get-regexp' 'cmp result expect'
test_expect_success 'inner whitespace kept verbatim' '
git config section.val "foo bar" &&
test "z$(git config section.val)" = "zfoo bar"
'
test_expect_success SYMLINKS 'symlinked configuration' '
ln -s notyet myconfig &&