diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-04 22:59:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-04 22:59:58 (GMT) |
| commit | 9a79c5a8b4e280601bcbeeed22e1e4968d06c10e (patch) | |
| tree | 4957a416f66f1e8afaf189b45136fb4a070eadcb /git-merge-resolve.sh | |
| parent | 3a2674337c12e958f8c697af991a0ef6c06ddd4d (diff) | |
| download | git-9a79c5a8b4e280601bcbeeed22e1e4968d06c10e.zip git-9a79c5a8b4e280601bcbeeed22e1e4968d06c10e.tar.gz git-9a79c5a8b4e280601bcbeeed22e1e4968d06c10e.tar.bz2 | |
git.c: two fixes, gitsetenv type and off-by-one error.
gitsetenv as implemented in compat/setenv.c takes two const char*
and int; match that.
Also fix an incorrect attempt in prepend_to_path() to
NUL-terminate the string which stuffed the NUL character at one
past the end of allocation, and was not needed to begin with (we
copy the old_path string including the NUL which terminates it).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions