projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-diff: do not turn off -p/-M with any diff options.
[git.git]
/
send-pack.c
diff --git
a/send-pack.c
b/send-pack.c
index
55d8ff7
..
3eeb18f
100644
(file)
--- a/
send-pack.c
+++ b/
send-pack.c
@@
-126,12
+126,12
@@
static int ref_newer(const unsigned char *new_sha1,
/* Both new and old must be commit-ish and new is descendant of
* old. Otherwise we require --force.
*/
/* Both new and old must be commit-ish and new is descendant of
* old. Otherwise we require --force.
*/
- o = deref_tag(parse_object(old_sha1));
+ o = deref_tag(parse_object(old_sha1)
, NULL, 0
);
if (!o || o->type != commit_type)
return 0;
old = (struct commit *) o;
if (!o || o->type != commit_type)
return 0;
old = (struct commit *) o;
- o = deref_tag(parse_object(new_sha1));
+ o = deref_tag(parse_object(new_sha1)
, NULL, 0
);
if (!o || o->type != commit_type)
return 0;
new = (struct commit *) o;
if (!o || o->type != commit_type)
return 0;
new = (struct commit *) o;
@@
-181,7
+181,7
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
int new_refs;
/* No funny business with the matcher */
int new_refs;
/* No funny business with the matcher */
- remote_tail = get_remote_heads(in, &remote_refs, 0, NULL);
+ remote_tail = get_remote_heads(in, &remote_refs, 0, NULL
, 1
);
get_local_heads();
/* match them up */
get_local_heads();
/* match them up */