FilesExpand file tree

 master

/

commit-tree.c

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

125 lines (110 loc) · 2.96 KB

 master

/

commit-tree.c

Copy path

Top

File metadata and controls

• Code
• Blame

125 lines (110 loc) · 2.96 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

27

28

29

30

31

32

33

34

35

36

37

38

39

40

41

42

43

44

45

46

47

48

49

50

51

52

53

54

55

56

57

58

59

60

61

62

63

64

65

66

67

68

69

70

71

72

73

74

75

76

77

78

79

80

81

82

83

84

85

86

87

88

89

90

91

92

93

94

95

96

97

98

99

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

/*

* GIT - The information manager from hell

*

* Copyright (C) Linus Torvalds, 2005

*/

#include "cache.h"

#include "commit.h"

#include "tree.h"

#include "builtin.h"

#include "utf8.h"

#include "gpg-interface.h"

static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1> <changelog";

static void new_parent(struct commit *parent, struct commit_list **parents_p)

{

unsigned char *sha1 = parent->object.sha1;

struct commit_list *parents;

for (parents = *parents_p; parents; parents = parents->next) {

if (parents->item == parent) {

error("duplicate parent %s ignored", sha1_to_hex(sha1));

return;

}

parents_p = &parents->next;

}

commit_list_insert(parent, parents_p);

}

static int commit_tree_config(const char *var, const char *value, void *cb)

{

int status = git_gpg_config(var, value, NULL);

if (status)

return status;

return git_default_config(var, value, cb);

}

int cmd_commit_tree(int argc, const char **argv, const char *prefix)

{

int i, got_tree = 0;

struct commit_list *parents = NULL;

unsigned char tree_sha1[20];

unsigned char commit_sha1[20];

struct strbuf buffer = STRBUF_INIT;

const char *sign_commit = NULL;

git_config(commit_tree_config, NULL);

if (argc < 2 || !strcmp(argv[1], "-h"))

usage(commit_tree_usage);

for (i = 1; i < argc; i++) {

const char *arg = argv[i];

if (!strcmp(arg, "-p")) {

unsigned char sha1[20];

if (argc <= ++i)

usage(commit_tree_usage);

if (get_sha1_commit(argv[i], sha1))

die("Not a valid object name %s", argv[i]);

assert_sha1_type(sha1, OBJ_COMMIT);

new_parent(lookup_commit(sha1), &parents);

continue;

}

if (!memcmp(arg, "-S", 2)) {

sign_commit = arg + 2;

continue;

}

if (!strcmp(arg, "-m")) {

if (argc <= ++i)

usage(commit_tree_usage);

if (buffer.len)

strbuf_addch(&buffer, '\n');

strbuf_addstr(&buffer, argv[i]);

strbuf_complete_line(&buffer);

continue;

}

if (!strcmp(arg, "-F")) {

int fd;

if (argc <= ++i)

usage(commit_tree_usage);

if (buffer.len)

strbuf_addch(&buffer, '\n');

if (!strcmp(argv[i], "-"))

fd = 0;

else {

fd = open(argv[i], O_RDONLY);

if (fd < 0)

die_errno("git commit-tree: failed to open '%s'",

argv[i]);

}

if (strbuf_read(&buffer, fd, 0) < 0)

die_errno("git commit-tree: failed to read '%s'",

argv[i]);

if (fd && close(fd))

die_errno("git commit-tree: failed to close '%s'",

argv[i]);

strbuf_complete_line(&buffer);

continue;

}

if (get_sha1_tree(arg, tree_sha1))

die("Not a valid object name %s", arg);

if (got_tree)

die("Cannot give more than one trees");

got_tree = 1;

}

if (!buffer.len) {

if (strbuf_read(&buffer, 0, 0) < 0)

die_errno("git commit-tree: failed to read");

}

if (commit_tree(&buffer, tree_sha1, parents, commit_sha1,

NULL, sign_commit)) {

strbuf_release(&buffer);

return 1;

}

printf("%s\n", sha1_to_hex(commit_sha1));

strbuf_release(&buffer);

return 0;

}