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

Merge branch 'maint'

Browse Source 
* maint:
  git-reset to remove "$GIT_DIR/MERGE_MSG"
  unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
This commit is contained in:
Junio C Hamano
2006-12-06 10:47:37 -08:00
parent 4003a58e41 49ed2bc466
commit 2d13b732e3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-reset.sh
View File

@ -63,6 +63,7 @@ case "$reset_type" in
;; ;;
esac esac
rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
"$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
exit $update_ref_status exit $update_ref_status

8
unpack-trees.c
View File

@ -370,7 +370,7 @@ int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
int i; int i;
struct object_list *posn = trees; struct object_list *posn = trees;
struct tree_entry_list df_conflict_list; struct tree_entry_list df_conflict_list;
struct cache_entry df_conflict_entry; static struct cache_entry *dfc;
memset(&df_conflict_list, 0, sizeof(df_conflict_list)); memset(&df_conflict_list, 0, sizeof(df_conflict_list));
df_conflict_list.next = &df_conflict_list; df_conflict_list.next = &df_conflict_list;
@ -381,8 +381,10 @@ int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
state.refresh_cache = 1; state.refresh_cache = 1;
o->merge_size = len; o->merge_size = len;
memset(&df_conflict_entry, 0, sizeof(df_conflict_entry));
o->df_conflict_entry = &df_conflict_entry; if (!dfc)
dfc = xcalloc(1, sizeof(struct cache_entry) + 1);
o->df_conflict_entry = dfc;
if (len) { if (len) {
posns = xmalloc(len * sizeof(struct tree_entry_list *)); posns = xmalloc(len * sizeof(struct tree_entry_list *));