diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-11-07 19:23:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 13:29:41 -0800 |
| commit | 92e2eb9c0a868348dd2caf2b923fd6542ca7ceb7 (patch) | |
| tree | 7633103f614e7905a6c057d49a444afb8501180d /git-merge-ours.sh | |
| parent | 0dd276b8713a484496a2ef694b6c72b1ddbef08b (diff) | |
| download | git-92e2eb9c0a868348dd2caf2b923fd6542ca7ceb7.tar.gz git-92e2eb9c0a868348dd2caf2b923fd6542ca7ceb7.tar.xz | |
Small bugfixes for http-push.c
This patch fixes three things:
- older libexpat does not know about enum XML_Status
- as in my patch for http-fetch, do not rely on a curl result in
free()d data
- calloc the new_lock structure
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions