commit - 2bdefe565f8d42c1fa6a794670e18f1d2d643c53
commit + da76fce2dfde1786444285db2a03ddf14328c662
blob - f7751d15e891510d5833ed339951573bce1d0167
blob + 32d8fc768f703d3c9e8fac8881adf39cfbc3583d
--- got/got.1
+++ got/got.1
Care should be taken not to create loops between references when
this option is used.
.El
-.It Cm branch Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Op Ar name
-Manage branches in a repository.
+.It Cm branch Oo Fl c Ar commit Oc Oo Fl r Ar repository-path Oc Oo Fl l Oc Oo Fl d Ar name Oc Oo Fl n Oc Op Ar name
+Create, list, or delete branches.
.Pp
Branches are managed via references which live in the
.Dq refs/heads/
.Pp
If invoked in a work tree without any arguments, print the name of the
work tree's current branch.
+.Pp
If a
.Ar name
argument is passed, attempt to create a branch reference with the given name.
work tree's current branch if invoked in a work tree, and otherwise to a commit
resolved via the repository's HEAD reference.
.Pp
+If invoked in a work tree, once the branch was created successfully
+switch the work tree's head reference to the newly created branch and
+update files across the entire work tree, just like
+.Cm got update -b Ar name
+would do.
+Show the status of each affected file, using the following status codes:
+.Bl -column YXZ description
+.It U Ta file was updated and contained no local changes
+.It G Ta file was updated and local changes were merged cleanly
+.It C Ta file was updated and conflicts occurred during merge
+.It D Ta file was deleted
+.It A Ta new file was added
+.It \(a~ Ta versioned file is obstructed by a non-regular file
+.It ! Ta a missing versioned file was restored
+.El
+.Pp
The options for
.Cm got branch
are as follows:
Any commit, tree, and blob objects belonging to the branch
remain in the repository and may be removed separately with
Git's garbage collector.
+.It Fl n
+Do not switch and update the work tree after creating a new branch.
.El
.It Cm br
Short alias for
blob - 7a50d3a7ec56e05bab9576a9e6d61188b261f9a5
blob + 6511394034a17291d582179257e2235d6f21731a
--- got/got.c
+++ got/got.c
usage_branch(void)
{
fprintf(stderr,
- "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
- "[name]\n", getprogname());
+ "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
+ "[name]\n", getprogname());
exit(1);
}
struct got_repository *repo = NULL;
struct got_worktree *worktree = NULL;
char *cwd = NULL, *repo_path = NULL;
- int ch, do_list = 0, do_show = 0;
+ int ch, do_list = 0, do_show = 0, do_update = 1;
const char *delref = NULL, *commit_id_arg = NULL;
+ struct got_reference *ref = NULL;
+ struct got_pathlist_head paths;
+ struct got_pathlist_entry *pe;
+ struct got_object_id *commit_id = NULL;
+ char *commit_id_str = NULL;
- while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
+ TAILQ_INIT(&paths);
+
+ while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
switch (ch) {
case 'c':
commit_id_arg = optarg;
break;
case 'l':
do_list = 1;
+ break;
+ case 'n':
+ do_update = 0;
break;
default:
usage_branch();
else if (delref)
error = delete_branch(repo, worktree, delref);
else {
- struct got_object_id *commit_id;
if (commit_id_arg == NULL)
commit_id_arg = worktree ?
got_worktree_get_head_ref_name(worktree) :
if (error)
goto done;
error = add_branch(repo, argv[0], commit_id);
- free(commit_id);
+ if (error)
+ goto done;
+ if (worktree && do_update) {
+ int did_something = 0;
+ char *branch_refname = NULL;
+
+ error = got_object_id_str(&commit_id_str, commit_id);
+ if (error)
+ goto done;
+ error = get_worktree_paths_from_argv(&paths, 0, NULL,
+ worktree);
+ if (error)
+ goto done;
+ if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
+ == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+ error = got_ref_open(&ref, repo, branch_refname, 0);
+ free(branch_refname);
+ if (error)
+ goto done;
+ error = switch_head_ref(ref, commit_id, worktree,
+ repo);
+ if (error)
+ goto done;
+ error = got_worktree_set_base_commit_id(worktree, repo,
+ commit_id);
+ if (error)
+ goto done;
+ error = got_worktree_checkout_files(worktree, &paths,
+ repo, update_progress, &did_something,
+ check_cancelled, NULL);
+ if (error)
+ goto done;
+ if (did_something)
+ printf("Updated to commit %s\n", commit_id_str);
+ }
}
done:
+ if (ref)
+ got_ref_close(ref);
if (repo)
got_repo_close(repo);
if (worktree)
got_worktree_close(worktree);
free(cwd);
free(repo_path);
+ free(commit_id);
+ free(commit_id_str);
+ TAILQ_FOREACH(pe, &paths, entry)
+ free((char *)pe->path);
+ got_pathlist_free(&paths);
return error;
}
blob - 2a7d11efbed29670e6e1ba9db1450f174a74d399
blob + c0793257149f648178c2a6dba7b0784645c26091
--- regress/cmdline/branch.sh
+++ regress/cmdline/branch.sh
function test_branch_create {
local testroot=`test_init branch_create`
+ local commit_id0=`git_show_head $testroot/repo`
# Create a branch based on repository's HEAD reference
got branch -r $testroot/repo newbranch
fi
# Create a branch based on the work tree's branch
- (cd $testroot/wt && got branch anotherbranch)
+ (cd $testroot/wt && got branch -n anotherbranch)
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
fi
# Create a branch based on another specific branch
- (cd $testroot/wt && got branch -c master yetanotherbranch)
+ (cd $testroot/wt && got branch -n -c master yetanotherbranch)
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
ret="$?"
if [ "$ret" != "0" ]; then
echo "git checkout command failed unexpectedly"
+ test_done "$testroot" "$ret"
+ return 1
fi
+
+ # Create a branch and let the work tree be updated to it
+ (cd $testroot/wt && got branch -c $commit_id0 updatebranch \
+ > $testroot/stdout)
+
+ echo -n "Switching work tree from refs/heads/newbranch to " \
+ > $testroot/stdout.expected
+ echo "refs/heads/updatebranch" >> $testroot/stdout.expected
+ echo "U gamma/delta" >> $testroot/stdout.expected
+ echo "Updated to commit $commit_id0" >> $testroot/stdout.expected
+
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ fi
test_done "$testroot" "$ret"
}
blob - 3c441f126f81e96af27255bfe1ac35115c1b2673
blob + 0537513b070d67823f9627435e20abc014c5c330
--- regress/cmdline/rebase.sh
+++ regress/cmdline/rebase.sh
return 1
fi
- (cd $testroot/wt && got branch newbranch)
+ (cd $testroot/wt && got branch -n newbranch)
echo "modified alpha on master" > $testroot/wt/alpha
(cd $testroot/wt && got commit -m 'test rebase_no_commits_to_rebase' \
return 1
fi
- (cd $testroot/wt && got branch > $testroot/stdout)
+ (cd $testroot/wt && got branch -n > $testroot/stdout)
echo "master" > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
