delta/git.git, branch ef/setenv-putenv

compat/setenv.c: error if name contains '='

2011-12-15T03:31:03+00:00

According to POSIX, setenv should error out with EINVAL if it's
asked to set an environment variable whose name contains an equals
sign. Implement this detail in our compatibility-fallback.

Signed-off-by: Erik Faye-Lund 
Signed-off-by: Junio C Hamano

compat/setenv.c: update errno when erroring out

2011-12-15T03:30:41+00:00

Previously, gitsetenv didn't update errno as it should when
erroring out. Fix this.

Signed-off-by: Erik Faye-Lund 
Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.7' into maint

2011-12-09T21:33:39+00:00

* maint-1.7.7:
  am: don't persist keepcr flag
  mingw: give waitpid the correct signature
  git symbolic-ref: documentation fix

am: don't persist keepcr flag

2011-12-09T18:49:43+00:00

The keepcr flag is only used in the split_patches function, which is
only called before a patch application has to stopped for user input,
not after resuming. It is therefore unnecessary to persist the
flag. This seems to have been the case since it was introduced in
ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to
git-mailsplit, 2010-02-27).

Signed-off-by: Martin von Zweigbergk 
Signed-off-by: Junio C Hamano

mingw: give waitpid the correct signature

2011-12-09T18:46:52+00:00

POSIX says that last parameter to waitpid should be 'int',
so let's make it so.

Signed-off-by: Erik Faye-Lund 
Signed-off-by: Junio C Hamano

git symbolic-ref: documentation fix

2011-12-08T19:10:12+00:00

The old "git symbolic-ref" manpage seemed to imply in one place that
symlinks are still the default way to represent symbolic references
and in another that symlinks are deprecated.  Fix the text and shorten
the justification for the change of implementation.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.7' into maint

2011-12-05T23:07:54+00:00

* maint-1.7.7:
  stripspace: fix outdated comment
  Add MYMETA.yml to perl/.gitignore

Merge branch 'maint-1.7.6' into maint-1.7.7

2011-12-05T23:07:49+00:00

* maint-1.7.6:
  stripspace: fix outdated comment
  Add MYMETA.yml to perl/.gitignore

stripspace: fix outdated comment

2011-12-05T23:04:38+00:00

The comment on top of stripspace() claims that the buffer
will no longer be NUL-terminated. However, this has not been
the case at least since the move to using strbuf in 2007.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Add MYMETA.yml to perl/.gitignore

2011-12-05T22:42:40+00:00

This file is auto-generated by newer versions of ExtUtils::MakeMaker
(presumably starting with the version shipping with Perl 5.14). It just
contains extra information about the environment and arguments to the
Makefile-building process, and should be ignored.

Signed-off-by: Sebastian Morr 
Signed-off-by: Junio C Hamano