From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2018 20:22:36 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-lockfile-fix'
X-Git-Tag: v2.19.0-rc0~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a856e7d69f51776e40633d6f1f1f38a7fd64f0d5;p=git

Merge branch 'ds/commit-graph-lockfile-fix'

Update to ds/generation-numbers topic.

* ds/commit-graph-lockfile-fix:
  commit-graph: fix UX issue when .lock file exists
  commit-graph.txt: update design document
  merge: check config before loading commits
  commit: use generation number in remove_redundant()
  commit: add short-circuit to paint_down_to_common()
  commit: use generation numbers for in_merge_bases()
  ref-filter: use generation number for --contains
  commit-graph: always load commit-graph information
  commit: use generations in paint_down_to_common()
  commit-graph: compute generation numbers
  commit: add generation number to struct commit
  ref-filter: fix outdated comment on in_commit_list
---

a856e7d69f51776e40633d6f1f1f38a7fd64f0d5
diff --cc commit.h
index e48f05dffc,b5afde1ae9..cb943013d0
--- a/commit.h
+++ b/commit.h
@@@ -33,7 -33,7 +36,8 @@@ struct commit 
  	 */
  	struct tree *maybe_tree;
  	uint32_t graph_pos;
+ 	uint32_t generation;
 +	unsigned int index;
  };
  
  extern int save_commit_buffer;