development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin rebase: only store fully-qualified refs in options.head_name

Browse source 
When running a rebase on a detached HEAD, we currently store the string
"detached HEAD" in options.head_name. That is a faithful translation of
the shell script version, and we still kind of need it for the purposes of
the scripted backends.

It is poor style for C, though, where we would really only want a valid,
fully-qualified ref name as value, and NULL for detached HEADs, using
"detached HEAD" for display only. Make it so.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pratik Karki 2018-09-04 14:27:20 -07:00 committed by Junio C Hamano
parent c54dacb50e
commit d4c569f8f4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builtin/rebase.c
View file

@ -169,7 +169,8 @@ static int run_specific_rebase(struct rebase_options *opts)
add_var(&script_snippet, "upstream_name", opts->upstream_name);
add_var(&script_snippet, "upstream",
oid_to_hex(&opts->upstream->object.oid));
add_var(&script_snippet, "head_name", opts->head_name);
add_var(&script_snippet, "head_name",
opts->head_name ? opts->head_name : "detached HEAD");
add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
add_var(&script_snippet, "onto", oid_to_hex(&opts->onto->object.oid));
add_var(&script_snippet, "onto_name", opts->onto_name);
@ -251,6 +252,9 @@ static int reset_head(struct object_id *oid, const char *action,
*old_orig = NULL, oid_old_orig;
int ret = 0;
if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
BUG("Not a fully qualified branch: '%s'", switch_to_branch);
if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0)
return -1;
@ -558,7 +562,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
* branch_name -- branch/commit being rebased, or
* HEAD (already detached)
* orig_head -- commit object name of tip of the branch before rebasing
* head_name -- refs/heads/<that-branch> or "detached HEAD"
* head_name -- refs/heads/<that-branch> or NULL (detached HEAD)
*/
if (argc > 0)
die("TODO: handle switch_to");
@ -575,7 +579,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
branch_name = options.head_name;
} else {
options.head_name = xstrdup("detached HEAD");
free(options.head_name);
options.head_name = NULL;
branch_name = "HEAD";
}
if (get_oid("HEAD", &options.orig_head))