mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  RelNotes-1.5.3.5: describe recent fixes
  merge-recursive.c: mrtree in merge() is not used before set
  sha1_file.c: avoid gcc signed overflow warnings
  Fix a small memory leak in builtin-add
  honor the http.sslVerify option in shell scripts
This commit is contained in:
Junio C Hamano
2007-10-29 12:53:54 -07:00
parent 8371d8fd09 e720c4382f
commit e2b7eaf0ca
6 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1572,7 +1572,7 @@ static int merge(struct commit *h1,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
struct tree *mrtree;
struct tree *mrtree = mrtree;
int clean;
if (show(4)) {