]>
Commit | Line | Data |
---|---|---|
e496c003 DB |
1 | #include "cache.h" |
2 | #include "branch.h" | |
3 | #include "refs.h" | |
4 | #include "remote.h" | |
5 | #include "commit.h" | |
6 | ||
7 | struct tracking { | |
8 | struct refspec spec; | |
9 | char *src; | |
10 | const char *remote; | |
11 | int matches; | |
12 | }; | |
13 | ||
14 | static int find_tracked_branch(struct remote *remote, void *priv) | |
15 | { | |
16 | struct tracking *tracking = priv; | |
17 | ||
18 | if (!remote_find_tracking(remote, &tracking->spec)) { | |
19 | if (++tracking->matches == 1) { | |
20 | tracking->src = tracking->spec.src; | |
21 | tracking->remote = remote->name; | |
22 | } else { | |
23 | free(tracking->spec.src); | |
24 | if (tracking->src) { | |
25 | free(tracking->src); | |
26 | tracking->src = NULL; | |
27 | } | |
28 | } | |
29 | tracking->spec.src = NULL; | |
30 | } | |
31 | ||
32 | return 0; | |
33 | } | |
34 | ||
a9f2c136 | 35 | static int should_setup_rebase(const char *origin) |
c998ae9b DS |
36 | { |
37 | switch (autorebase) { | |
38 | case AUTOREBASE_NEVER: | |
39 | return 0; | |
40 | case AUTOREBASE_LOCAL: | |
a9f2c136 | 41 | return origin == NULL; |
c998ae9b | 42 | case AUTOREBASE_REMOTE: |
a9f2c136 | 43 | return origin != NULL; |
c998ae9b DS |
44 | case AUTOREBASE_ALWAYS: |
45 | return 1; | |
46 | } | |
47 | return 0; | |
48 | } | |
49 | ||
a9f2c136 JH |
50 | void install_branch_config(int flag, const char *local, const char *origin, const char *remote) |
51 | { | |
85e2233f MM |
52 | const char *shortname = remote + 11; |
53 | int remote_is_branch = !prefixcmp(remote, "refs/heads/"); | |
a9f2c136 JH |
54 | struct strbuf key = STRBUF_INIT; |
55 | int rebasing = should_setup_rebase(origin); | |
56 | ||
85e2233f MM |
57 | if (remote_is_branch |
58 | && !strcmp(local, shortname) | |
59 | && !origin) { | |
60 | warning("Not setting branch %s as its own upstream.", | |
61 | local); | |
62 | return; | |
63 | } | |
64 | ||
a9f2c136 JH |
65 | strbuf_addf(&key, "branch.%s.remote", local); |
66 | git_config_set(key.buf, origin ? origin : "."); | |
67 | ||
68 | strbuf_reset(&key); | |
69 | strbuf_addf(&key, "branch.%s.merge", local); | |
70 | git_config_set(key.buf, remote); | |
71 | ||
72 | if (rebasing) { | |
73 | strbuf_reset(&key); | |
74 | strbuf_addf(&key, "branch.%s.rebase", local); | |
75 | git_config_set(key.buf, "true"); | |
76 | } | |
77 | ||
72f60083 JH |
78 | if (flag & BRANCH_CONFIG_VERBOSE) { |
79 | strbuf_reset(&key); | |
80 | ||
81 | strbuf_addstr(&key, origin ? "remote" : "local"); | |
82 | ||
83 | /* Are we tracking a proper "branch"? */ | |
85e2233f MM |
84 | if (remote_is_branch) { |
85 | strbuf_addf(&key, " branch %s", shortname); | |
72f60083 JH |
86 | if (origin) |
87 | strbuf_addf(&key, " from %s", origin); | |
88 | } | |
89 | else | |
90 | strbuf_addf(&key, " ref %s", remote); | |
91 | printf("Branch %s set up to track %s%s.\n", | |
92 | local, key.buf, | |
93 | rebasing ? " by rebasing" : ""); | |
94 | } | |
a9f2c136 JH |
95 | strbuf_release(&key); |
96 | } | |
97 | ||
e496c003 DB |
98 | /* |
99 | * This is called when new_ref is branched off of orig_ref, and tries | |
100 | * to infer the settings for branch.<new_ref>.{remote,merge} from the | |
101 | * config. | |
102 | */ | |
9ed36cfa JS |
103 | static int setup_tracking(const char *new_ref, const char *orig_ref, |
104 | enum branch_track track) | |
e496c003 | 105 | { |
e496c003 DB |
106 | struct tracking tracking; |
107 | ||
108 | if (strlen(new_ref) > 1024 - 7 - 7 - 1) | |
109 | return error("Tracking not set up: name too long: %s", | |
110 | new_ref); | |
111 | ||
112 | memset(&tracking, 0, sizeof(tracking)); | |
113 | tracking.spec.dst = (char *)orig_ref; | |
9ed36cfa | 114 | if (for_each_remote(find_tracked_branch, &tracking)) |
e496c003 DB |
115 | return 1; |
116 | ||
9ed36cfa JS |
117 | if (!tracking.matches) |
118 | switch (track) { | |
119 | case BRANCH_TRACK_ALWAYS: | |
120 | case BRANCH_TRACK_EXPLICIT: | |
4fc50066 | 121 | case BRANCH_TRACK_OVERRIDE: |
9ed36cfa JS |
122 | break; |
123 | default: | |
124 | return 1; | |
125 | } | |
126 | ||
e496c003 DB |
127 | if (tracking.matches > 1) |
128 | return error("Not tracking: ambiguous information for ref %s", | |
129 | orig_ref); | |
130 | ||
a9f2c136 JH |
131 | install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote, |
132 | tracking.src ? tracking.src : orig_ref); | |
e496c003 | 133 | |
a9f2c136 | 134 | free(tracking.src); |
e496c003 DB |
135 | return 0; |
136 | } | |
137 | ||
138 | void create_branch(const char *head, | |
139 | const char *name, const char *start_name, | |
9ed36cfa | 140 | int force, int reflog, enum branch_track track) |
e496c003 | 141 | { |
4fc50066 | 142 | struct ref_lock *lock = NULL; |
e496c003 DB |
143 | struct commit *commit; |
144 | unsigned char sha1[20]; | |
8415d5c7 JH |
145 | char *real_ref, msg[PATH_MAX + 20]; |
146 | struct strbuf ref = STRBUF_INIT; | |
e496c003 | 147 | int forcing = 0; |
4fc50066 IL |
148 | int dont_change_ref = 0; |
149 | int explicit_tracking = 0; | |
150 | ||
151 | if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE) | |
152 | explicit_tracking = 1; | |
e496c003 | 153 | |
a2fab531 | 154 | if (strbuf_check_branch_ref(&ref, name)) |
e496c003 DB |
155 | die("'%s' is not a valid branch name.", name); |
156 | ||
8415d5c7 | 157 | if (resolve_ref(ref.buf, sha1, 1, NULL)) { |
4fc50066 IL |
158 | if (!force && track == BRANCH_TRACK_OVERRIDE) |
159 | dont_change_ref = 1; | |
160 | else if (!force) | |
e496c003 DB |
161 | die("A branch named '%s' already exists.", name); |
162 | else if (!is_bare_repository() && !strcmp(head, name)) | |
163 | die("Cannot force update the current branch."); | |
164 | forcing = 1; | |
165 | } | |
166 | ||
167 | real_ref = NULL; | |
168 | if (get_sha1(start_name, sha1)) | |
169 | die("Not a valid object name: '%s'.", start_name); | |
170 | ||
171 | switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) { | |
172 | case 0: | |
173 | /* Not branching from any existing branch */ | |
4fc50066 | 174 | if (explicit_tracking) |
9ed36cfa | 175 | die("Cannot setup tracking information; starting point is not a branch."); |
e496c003 DB |
176 | break; |
177 | case 1: | |
51a94af8 | 178 | /* Unique completion -- good, only if it is a real ref */ |
4fc50066 | 179 | if (explicit_tracking && !strcmp(real_ref, "HEAD")) |
51a94af8 | 180 | die("Cannot setup tracking information; starting point is not a branch."); |
e496c003 DB |
181 | break; |
182 | default: | |
183 | die("Ambiguous object name: '%s'.", start_name); | |
184 | break; | |
185 | } | |
186 | ||
187 | if ((commit = lookup_commit_reference(sha1)) == NULL) | |
188 | die("Not a valid branch point: '%s'.", start_name); | |
189 | hashcpy(sha1, commit->object.sha1); | |
190 | ||
4fc50066 IL |
191 | if (!dont_change_ref) { |
192 | lock = lock_any_ref_for_update(ref.buf, NULL, 0); | |
193 | if (!lock) | |
194 | die_errno("Failed to lock ref for update"); | |
195 | } | |
e496c003 DB |
196 | |
197 | if (reflog) | |
198 | log_all_ref_updates = 1; | |
199 | ||
200 | if (forcing) | |
da288e25 | 201 | snprintf(msg, sizeof msg, "branch: Reset to %s", |
e496c003 | 202 | start_name); |
4fc50066 | 203 | else if (!dont_change_ref) |
e496c003 DB |
204 | snprintf(msg, sizeof msg, "branch: Created from %s", |
205 | start_name); | |
206 | ||
e496c003 | 207 | if (real_ref && track) |
9ed36cfa | 208 | setup_tracking(name, real_ref, track); |
e496c003 | 209 | |
4fc50066 IL |
210 | if (!dont_change_ref) |
211 | if (write_ref_sha1(lock, sha1, msg) < 0) | |
212 | die_errno("Failed to write ref"); | |
e496c003 | 213 | |
8415d5c7 | 214 | strbuf_release(&ref); |
9ed36cfa | 215 | free(real_ref); |
e496c003 | 216 | } |
c369e7b8 DB |
217 | |
218 | void remove_branch_state(void) | |
219 | { | |
220 | unlink(git_path("MERGE_HEAD")); | |
0af0ac7e | 221 | unlink(git_path("MERGE_RR")); |
c369e7b8 | 222 | unlink(git_path("MERGE_MSG")); |
cf10f9fd | 223 | unlink(git_path("MERGE_MODE")); |
c369e7b8 DB |
224 | unlink(git_path("SQUASH_MSG")); |
225 | } |