git-series: Tracking the History of History

Transcription

1 git-series: Tracking the History of History Josh Triplett Linux Plumbers Conference 2016

2

3 RFC: feature

4 RFC: feature

5 Development

6 git commit

7 git format-patch -3

8 git format-patch -3 [PATCH 1/3] Cleanup and yak shaving [PATCH 2/3] Implement feature [PATCH 3/3] Use feature

9 git request-pull...

10 git request-pull... git hub pull new...

11 Feedback Split cleanup and yak shaving

12 Feedback Split cleanup and yak shaving Additional use of feature

13 Feedback Split cleanup and yak shaving Additional use of feature Add benchmark data

14 Feedback Split cleanup and yak shaving Additional use of feature Add benchmark data Add tests

15 Feedback Split cleanup and yak shaving Additional use of feature Add benchmark data Add tests Fix typo

16 Rewriting history

17 git commit --amend

18 git rebase -i

19 fast-forward vs non-fast-forward

20 git format-patch -v2-6

21 git format-patch -v2-6 [PATCH v2 1/6] Cleanup [PATCH v2 2/6] Yak shaving [PATCH v2 3/6] Implement feature [PATCH v2 4/6] Tests for feature [PATCH v2 5/6] Use feature [PATCH v2 6/6] Use feature elsewhere

22 What about v1?

23 git reflog

24 mutt -f =Sent

25 Public mailing list archives

26 Git tracks history

27 We rewrite history

28 We need the history of history

29 git submodule

30 git submodule -- --fthagn

31 Two common solutions

32 Two common solutions Pull one of the histories out of git

33 Pull the patches out of git

34 quilt patch files

35 debian/patches/*

36 git rebase -i

37 Pull the history of the patches out of git

38 Versioned branch names

39 feature-v1

40 feature-v1 feature-v2

41 feature-v1 feature-v2 feature-v3-typofix

42 feature-v1 feature-v2 feature-v3-typofix feature-v8-rebased-4.6-alice-fix

43 feature-v1 feature-v2 feature-v3-typofix feature-v8-rebased-4.6-alice-fix feature-v8-rebased-4.6-alice-fix.pptx

44 We have a version control system!

45 Cover letter

46 Cover letter [PATCH v2 0/5] feature: summary of new idea

47 Base

48 Base git format-patch -3 git format-patch -v2-6

49 Base git format-patch -3 git format-patch -v2-6 git rebase -i...

50 Base git format-patch -3 git format-patch -v2-6 git rebase -i... git log

51 Collaboration

52 Never rewrite published history

53 How can you collaborate on it?

54 Patch series

55 Patch series Feature backport

56 Patch series Feature backport Distribution package

57 git-series

58 git-series Tracks the history of a patch series

59 git-series Tracks the history of a patch series Handles non-fast-forwarding changes

60 git-series Tracks the history of a patch series Handles non-fast-forwarding changes Tracks a cover letter

61 git-series Tracks the history of a patch series Handles non-fast-forwarding changes Tracks a cover letter Tracks the base of the series

62 Demo

63 Internals

64 Internals INTERNALS.md

65 Review of git internals

66 blob (file) Review of git internals

67 Review of git internals blob (file) tree (directory)

68 Review of git internals blob (file) tree (directory) commit (tree, message, parents)

69 Review of git internals blob (file) tree (directory) commit (tree, message, parents) tag

70 Review of git internals blob (file) tree (directory) commit (tree, message, parents) tag ref

71 trees can refer to commits

72 trees can refer to commits gitlink

73 Requirement: Every object must remain reachable by git.

74 Requirement: Every object must remain reachable by git. Required to keep git from pruning objects Required for push/pull of series

75 v1 a v2 a v1 b v2 b upstream y upstream x

76 series v1 series v2 v1 a v2 a v1 b v2 b upstream y upstream x

77 series v1 series v2 refs/heads/git-series/feature v1 a v2 a v1 b v2 b upstream y upstream x

78 series v1 series v2 refs/heads/git-series/feature series v1 a v2 a v1 b v2 b upstream y upstream x

79 series v1 series v2 refs/heads/git-series/feature series v1 a v2 a base v1 b v2 b upstream y upstream x

80 series v1 series v2 refs/heads/git-series/feature v1 a series v2 a series base v1 b v2 b upstream y upstream x

81 series v1 series v2 refs/heads/git-series/feature v1 a series v2 a series base v1 b v2 b upstream y base upstream x

82 series v1 series v2 refs/heads/git-series/feature v1 a series v2 a series cover base v1 b v2 b cover letter blob upstream y base upstream x

83 git doesn t follow gitlinks for reachability or push/pull

84 git doesn t follow gitlinks for reachability or push/pull Have to also include series as a parent

85 git doesn t follow gitlinks for reachability or push/pull Have to also include series as a parent git-series ignores that parent when traversing

86 HEAD Current branch

87 HEAD Current branch refs/shead Current series

88 Working and staged (as seen in status)?

89 Working and staged (as seen in status)? refs/git-series-internals/working/feature refs/git-series-internals/staged/feature

90 Avoiding errors

91 Long and complex error messages

92 Long and complex error messages suggest a design flaw

93 Long and complex error messages suggest a design flaw Redesign to make the error impossible

94 Detach from a series or check out a new series with uncommitted changes to the series (series, base, cover)

95 Detach from a series or check out a new series with uncommitted changes to the series (series, base, cover) Every series has its own independent working and staged versions

96 Detach from a series or check out a new series without making any commits

97 Detach from a series or check out a new series without making any commits git series start makes working/staged

98 Detach from a series or check out a new series without making any commits git series start makes working/staged (new, no commits yet)

99 Detach from a series or check out a new series without making any commits git series start makes working/staged (new, no commits yet) git series checkout works

100 Long and complex error messages suggest a design flaw Redesign to make the error impossible

101 git series rebase

102 git series rebase git rebase --continue

103 Rust and libgit2

104

105 Questions?