add boolean diff.suppress-blank-empty config option

[git.git] / http-push.c
diff --git a/http-push.c b/http-push.c

index c93e781c3b503bae6ee7c6735fa058aa0a98e026..68052888570af7d09535db8831b8cf3ef2881589 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -9,11 +9,12 @@
  #include "revision.h"
  #include "exec_cmd.h"
  #include "remote.h"
+#include "list-objects.h"
  
  #include <expat.h>
  
  static const char http_push_usage[] =
-"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
+"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
  
  #ifndef XML_STATUS_OK
  enum XML_Status {
@@ -782,7 +783,7 @@ static void finish_request(struct transfer_request *request)
                                         lst = &((*lst)->next);
                                 *lst = (*lst)->next;
  
-                               if (!verify_pack(target, 0))
+                               if (!verify_pack(target))
                                         install_packed_git(target);
                                 else
                                         remote->can_update_info_refs = 0;
@@ -1878,31 +1879,6 @@ static int ref_newer(const unsigned char *new_sha1,
         return found;
  }
  
-static void mark_edge_parents_uninteresting(struct commit *commit)
-{
-       struct commit_list *parents;
-
-       for (parents = commit->parents; parents; parents = parents->next) {
-               struct commit *parent = parents->item;
-               if (!(parent->object.flags & UNINTERESTING))
-                       continue;
-               mark_tree_uninteresting(parent->tree);
-       }
-}
-
-static void mark_edges_uninteresting(struct commit_list *list)
-{
-       for ( ; list; list = list->next) {
-               struct commit *commit = list->item;
-
-               if (commit->object.flags & UNINTERESTING) {
-                       mark_tree_uninteresting(commit->tree);
-                       continue;
-               }
-               mark_edge_parents_uninteresting(commit);
-       }
-}
-
  static void add_remote_info_ref(struct remote_ls_ctx *ls)
  {
         struct strbuf *buf = (struct strbuf *)ls->userData;
@@ -2408,6 +2384,7 @@ int main(int argc, char **argv)
                 }
                 init_revisions(&revs, setup_git_directory());
                 setup_revisions(commit_argc, commit_argv, &revs, NULL);
+               revs.edge_hint = 0; /* just in case */
                 free(new_sha1_hex);
                 if (old_sha1_hex) {
                         free(old_sha1_hex);
@@ -2418,7 +2395,7 @@ int main(int argc, char **argv)
                 pushing = 0;
                 if (prepare_revision_walk(&revs))
                         die("revision walk setup failed");
-               mark_edges_uninteresting(revs.commits);
+               mark_edges_uninteresting(revs.commits, &revs, NULL);
                 objects_to_send = get_delta(&revs, ref_lock);
                 finish_all_active_slots();