mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow tracking branches to set up rebase by default.

Browse Source 
Change cd67e4d4 introduced a new configuration parameter that told
pull to automatically perform a rebase instead of a merge.  This
change provides a configuration option to enable this feature
automatically when creating a new branch.

If the variable branch.autosetuprebase applies for a branch that's
being created, that branch will have branch.<name>.rebase set to true.

Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dustin Sallings
2008-05-10 15:36:29 -07:00
committed by Junio C Hamano
parent d1a8d0ea5f
commit c998ae9baa
6 changed files with 294 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
branch.c
View File

@ -32,6 +32,21 @@ static int find_tracked_branch(struct remote *remote, void *priv)
return 0;
}
static int should_setup_rebase(const struct tracking *tracking)
{
switch (autorebase) {
case AUTOREBASE_NEVER:
return 0;
case AUTOREBASE_LOCAL:
return tracking->remote == NULL;
case AUTOREBASE_REMOTE:
return tracking->remote != NULL;
case AUTOREBASE_ALWAYS:
return 1;
}
return 0;
}
/*
* This is called when new_ref is branched off of orig_ref, and tries
* to infer the settings for branch.<new_ref>.{remote,merge} from the
@ -69,9 +84,14 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
git_config_set(key, tracking.remote ? tracking.remote : ".");
sprintf(key, "branch.%s.merge", new_ref);
git_config_set(key, tracking.src ? tracking.src : orig_ref);
free(tracking.src);
printf("Branch %s set up to track %s branch %s.\n", new_ref,
tracking.remote ? "remote" : "local", orig_ref);
if (should_setup_rebase(&tracking)) {
sprintf(key, "branch.%s.rebase", new_ref);
git_config_set(key, "true");
printf("This branch will rebase on pull.\n");
}
free(tracking.src);
return 0;
}