git, branch v1.7.7-rc2

Git 1.7.7-rc2

2011-09-18T22:41:34Z

Signed-off-by: Junio C Hamano

Merge branch 'ci/forbid-unwanted-current-branch-update'

2011-09-17T04:48:10Z

* ci/forbid-unwanted-current-branch-update: branch --set-upstream: regression fix

branch --set-upstream: regression fix

2011-09-17T04:47:47Z

The "git branch" command, while not in listing mode, calls create_branch() even when the target branch already exists, and it does so even when it is not interested in updating the value of the branch (i.e. the name of the commit object that sits at the tip of the existing branch). This happens when the command is run with "--set-upstream" option. The earlier safety-measure to prevent "git branch -f $branch $commit" from updating the currently checked out branch did not take it into account, and we no longer can update the tracking information of the current branch. Minimally fix this regression by telling the validation code if it is called to really update the value of a potentially existing branch, or if the caller merely is interested in updating auxiliary aspects of a branch. Reported-and-Tested-by: Jay Soffian Signed-off-by: Junio C Hamano

Disambiguate duplicate t9160* tests

2011-09-16T21:06:19Z

1e5814f created t9160-git-svn-mergeinfo-push.sh on 11/9/7 40a1530 created t9160-git-svn-preserve-empty-dirs.sh on 11/7/20 The former test script is renumbered to t9161. Signed-off-by: Frédéric Heitzmann Signed-off-by: Junio C Hamano

Merge branch 'ph/format-patch-no-color'

2011-09-15T04:43:57Z

* ph/format-patch-no-color: format-patch: ignore ui.color

git-svn: teach git-svn to populate svn:mergeinfo

2011-09-13T08:12:13Z

Allow git-svn to populate the svn:mergeinfo property automatically in a narrow range of circumstances. Specifically, when dcommitting a revision with multiple parents, all but (potentially) the first of which have been committed to SVN in the same repository as the target of the dcommit. In this case, the merge info is the union of that given by each of the parents, plus all changes introduced to the first parent by the other parents. In all other cases where a revision to be committed has multiple parents, cause "git svn dcommit" to raise an error rather than completing the commit and potentially losing history information in the upstream SVN repository. This behavior is disabled by default, and can be enabled by setting the svn.pushmergeinfo config option. [ew: minor style changes and manpage merge fix] Acked-by: Eric Wong Signed-off-by: Bryan Jacobs

format-patch: ignore ui.color

2011-09-12T18:43:58Z

commit c9bfb953 (want_color: automatically fallback to color.ui, 2011-08-17) introduced a regression where format-patch produces colorized patches when color.ui is set to "always". In f3aafa4 (Disable color detection during format-patch, 2006-07-09), git_format_config was taught to intercept diff.color to avoid passing it down to git_log_config and later, git_diff_ui_config. Teach git_format_config to intercept color.ui in the same way. Helped-by: Jeff King Signed-off-by: Pang Yan Han Signed-off-by: Junio C Hamano

Git 1.7.7-rc1

2011-09-12T17:44:32Z

Signed-off-by: Junio C Hamano

Sync with 1.7.6.3

2011-09-12T17:43:17Z

Signed-off-by: Junio C Hamano

Merge branch 'jn/remote-helpers-doc'

2011-09-12T17:38:11Z

* jn/remote-helpers-doc: (short) documentation for the testgit remote helper Documentation/git-remote-helpers: explain how import works with multiple refs Documentation/remote-helpers: explain capabilities first