undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http-push: fix revision walk

Browse Source 
The revision walk was not including tags because setup_revisions zeroes out
the revs flags.  Pass --objects so it picks up all the necessary bits.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Nick Hengeveld 2006-03-10 20:17:55 -08:00 committed by Junio C Hamano
parent f2561fda36
commit 5241bfe6d1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
http-push.c
View File

@ -1752,23 +1752,20 @@ int main(int argc, char **argv)
} }
/* Set up revision info for this refspec */ /* Set up revision info for this refspec */
const char *commit_argv[3]; const char *commit_argv[4];
int commit_argc = 2; int commit_argc = 3;
char *new_sha1_hex = strdup(sha1_to_hex(ref->new_sha1)); char *new_sha1_hex = strdup(sha1_to_hex(ref->new_sha1));
char *old_sha1_hex = NULL; char *old_sha1_hex = NULL;
commit_argv[1] = new_sha1_hex; commit_argv[1] = "--objects";
commit_argv[2] = new_sha1_hex;
if (!push_all && !is_zero_sha1(ref->old_sha1)) { if (!push_all && !is_zero_sha1(ref->old_sha1)) {
old_sha1_hex = xmalloc(42); old_sha1_hex = xmalloc(42);
sprintf(old_sha1_hex, "^%s", sprintf(old_sha1_hex, "^%s",
sha1_to_hex(ref->old_sha1)); sha1_to_hex(ref->old_sha1));
commit_argv[2] = old_sha1_hex; commit_argv[3] = old_sha1_hex;
commit_argc++; commit_argc++;
} }
revs.commits = NULL;
setup_revisions(commit_argc, commit_argv, &revs, NULL); setup_revisions(commit_argc, commit_argv, &revs, NULL);
revs.tag_objects = 1;
revs.tree_objects = 1;
revs.blob_objects = 1;
free(new_sha1_hex); free(new_sha1_hex);
if (old_sha1_hex) { if (old_sha1_hex) {
free(old_sha1_hex); free(old_sha1_hex);