user/sven/git.git/branch.c, branch v1.8.0.2

Remove i18n legos in notifying new branch tracking setup

2012-06-07T18:46:02Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

checkout: suppress tracking message with "-q"

2012-03-27T04:32:43Z

Like the "switched to..." message (which is already suppressed by "-q"), this message is purely informational. Let's silence it if the user asked us to be quiet. This patch is slightly more than a one-liner, because we have to teach create_branch to propagate the flag all the way down to install_branch_config. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'nd/resolve-ref'

2011-12-20T00:05:50Z

* nd/resolve-ref: Rename resolve_ref() to resolve_ref_unsafe() Convert resolve_ref+xstrdup to new resolve_refdup function revert: convert resolve_ref() to read_ref_full()

Merge branch 'jn/maint-sequencer-fixes'

2011-12-20T00:05:45Z

* jn/maint-sequencer-fixes: revert: stop creating and removing sequencer-old directory Revert "reset: Make reset remove the sequencer state" revert: do not remove state until sequence is finished revert: allow single-pick in the middle of cherry-pick sequence revert: pass around rev-list args in already-parsed form revert: allow cherry-pick --continue to commit before resuming revert: give --continue handling its own function

Merge branch 'jn/branch-move-to-self'

2011-12-14T06:53:08Z

* jn/branch-move-to-self: Allow checkout -B to update the current branch branch: allow a no-op "branch -M HEAD"

Rename resolve_ref() to resolve_ref_unsafe()

2011-12-13T17:39:46Z

resolve_ref() may return a pointer to a shared buffer and can be overwritten by the next resolve_ref() calls. Callers need to pay attention, not to keep the pointer when the next call happens. Rename with "_unsafe" suffix to warn developers (or reviewers) before introducing new call sites. This patch is generated using the following command git grep -l 'resolve_ref(' -- '*.[ch]'|xargs sed -i 's/resolve_ref(/resolve_ref_unsafe(/g' Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Revert "reset: Make reset remove the sequencer state"

2011-12-12T21:33:53Z

This reverts commit 95eb88d8ee588d89b4f06d2753ed4d16ab13b39f, which was a UI experiment that did not reflect how "git reset" actually gets used. The reversion also fixes a test, indicated in the patch. Encouraged-by: Johannes Sixt Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'jc/request-pull-show-head-4'

2011-12-09T21:37:05Z

* jc/request-pull-show-head-4: request-pull: use the annotated tag contents fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error environment.c: Fix an sparse "symbol not declared" warning builtin/log.c: Fix an "Using plain integer as NULL pointer" warning fmt-merge-msg: use branch.$name.description request-pull: use the branch description request-pull: state what commit to expect request-pull: modernize style branch: teach --edit-description option format-patch: use branch description in cover letter branch: add read_branch_desc() helper function Conflicts: builtin/branch.c

Allow checkout -B to update the current branch

2011-11-28T19:40:46Z

When on master, "git checkout -B master " is a more natural way to say "git reset --keep ", which was originally invented for the exact purpose of moving to the named commit while keeping the local changes around. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

revert: write REVERT_HEAD pseudoref during conflicted revert

2011-11-22T21:34:44Z

When conflicts are encountered while reverting a commit, it can be handy to have the name of that commit easily available. For example, to produce a copy of the patch to refer to while resolving conflicts: $ git revert 2eceb2a8 error: could not revert 2eceb2a8... awesome, buggy feature $ git show -R REVERT_HEAD >the-patch $ edit $(git diff --name-only) Set a REVERT_HEAD pseudoref when "git revert" does not make a commit, for cases like this. This also makes it possible for scripts to distinguish between a revert that encountered conflicts and other sources of an unmerged index. After successfully committing, resetting with "git reset", or moving to another commit with "git checkout" or "git reset", the pseudoref is no longer useful, so remove it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano