delta/git.git/merge-recursive.c, branch ce/https-public-key-pinning

Remove get_object_hash.

2015-11-20T13:02:05+00:00

Convert all instances of get_object_hash to use an appropriate reference
to the hash member of the oid member of struct object.  This provides no
functional change, as it is essentially a macro substitution.

Signed-off-by: brian m. carlson 
Signed-off-by: Jeff King

Convert struct object to object_id

2015-11-20T13:02:05+00:00

struct object is one of the major data structures dealing with object
IDs.  Convert it to use struct object_id instead of an unsigned char
array.  Convert get_object_hash to refer to the new member as well.

Signed-off-by: brian m. carlson 
Signed-off-by: Jeff King

Add several uses of get_object_hash.

2015-11-20T13:02:05+00:00

Convert most instances where the sha1 member of struct object is
dereferenced to use get_object_hash.  Most instances that are passed to
functions that have versions taking struct object_id, such as
get_sha1_hex/get_oid_hex, or instances that can be trivially converted
to use struct object_id instead, are not converted.

Signed-off-by: brian m. carlson 
Signed-off-by: Jeff King

Merge branch 'jk/delete-modechange-conflict'

2015-10-30T20:06:57+00:00

Merging a branch that removes a path and another that changes the
mode bits on the same path should have conflicted at the path, but
it didn't and silently favoured the removal.

* jk/delete-modechange-conflict:
  merge: detect delete/modechange conflict
  t6031: generalize for recursive and resolve strategies
  t6031: move triple-rename test to t3030

merge: detect delete/modechange conflict

2015-10-26T21:49:31+00:00

If one side deletes a file and the other changes its
content, we notice and report a conflict. However, if
instead of changing the content, we change only the mode,
the merge does not notice (and the mode change is silently
dropped).

The trivial index merge notices the problem and correctly
leaves the conflict in the index, but both merge-recursive
and merge-one-file will silently resolve this in favor of
the deletion.  In many cases that is a sane resolution, but
we should be punting to the user whenever there is any
question. So let's detect and treat this as a conflict (in
both strategies).

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

merge-recursive: convert malloc / strcpy to strbuf

2015-10-05T18:08:04+00:00

This would be a fairly routine use of xstrfmt, except that
we need to remember the length of the result to pass to
cache_name_pos. So just use a strbuf, which makes this
simple.

As a bonus, this gets rid of confusing references to
"pathlen+1". The "1" is for the trailing slash we added, but
that is automatically accounted for in the strbuf's len
parameter.

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

use file_exists() to check if a file exists in the worktree

2015-05-20T20:49:10+00:00

Call file_exists() instead of open-coding it.  That's shorter, simpler
and the intent becomes clearer.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

merge-recursive: fix memleaks

2015-03-23T18:12:58+00:00

These string_list instances were allocated by get_renames() and
get_unmerged for the sole use of this caller, and the function is
responsible for freeing them, not just their contents.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-bases'

2015-01-07T20:55:05+00:00

The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.

* jc/merge-bases:
  get_merge_bases(): always clean-up object flags
  bisect: clean flags after checking merge bases

tree.c: update read_tree_recursive callback to pass strbuf as base

2014-12-01T19:32:29+00:00

This allows the callback to use 'base' as a temporary buffer to
quickly assemble full path "without" extra allocation. The callback
has to restore it afterwards of course.

Helped-by: Eric Sunshine 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano