global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 13:10:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Git 1.7.2.3
  builtin/merge_recursive.c: Add an usage string and make use of it.
  t7406 & t7407: add missing && at end of lines
  t7405: cd inside subshell instead of around
This commit is contained in:
Junio C Hamano
2010-09-03 10:26:34 -07:00
parent 36af9b7b61 cd1547d204
commit 79c1435cb5
6 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/RelNotes-1.7.2.3.txt
View File

@@ -37,10 +37,3 @@ Fixes since v1.7.2.2
* "git pack-refs --all --prune" did not remove a directory that has
become empty.
---
exec >/var/tmp/1
echo O=$(git describe maint)
O=v1.7.2.2
git shortlog --no-merges $O..maint
exit 0

3
Documentation/git.txt
View File

@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.7.2.2/git.html[documentation for release 1.7.2.2]
* link:v1.7.2.3/git.html[documentation for release 1.7.2.3]
* release notes for
link:RelNotes-1.7.2.3.txt[1.7.2.3],
link:RelNotes-1.7.2.2.txt[1.7.2.2],
link:RelNotes-1.7.2.1.txt[1.7.2.1],
link:RelNotes-1.7.2.txt[1.7.2].

5
builtin/merge-recursive.c
View File

@@ -3,6 +3,9 @@
#include "tag.h"
#include "merge-recursive.h"
static const char builtin_merge_recursive_usage[] =
"git %s <base>... -- <head> <remote> ...";
static const char *better_branch_name(const char *branch)
{
static char githead_env[8 + 40 + 1];
@@ -29,7 +32,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
o.subtree_shift = "";
if (argc < 4)
usagef("%s <base>... -- <head> <remote> ...", argv[0]);
usagef(builtin_merge_recursive_usage, argv[0]);
for (i = 1; i < argc; ++i) {
const char *arg = argv[i];

17
t/t7405-submodule-merge.sh
View File

@@ -67,7 +67,7 @@ test_expect_success setup '
# b in the main repository.
test_expect_success 'setup for merge search' '
mkdir merge-search &&
cd merge-search &&
(cd merge-search &&
git init &&
mkdir sub &&
(cd sub &&
@@ -101,8 +101,7 @@ test_expect_success 'setup for merge search' '
git checkout -b sub-d sub-b &&
git merge sub-c) &&
git commit -a -m "d" &&
git branch test b &&
cd ..
git branch test b)
'
test_expect_success 'merge with one side as a fast-forward of the other' '
@@ -126,7 +125,7 @@ test_expect_success 'merging should conflict for non fast-forward' '
'
test_expect_success 'merging should fail for ambiguous common parent' '
cd merge-search &&
(cd merge-search &&
git checkout -b test-ambiguous b &&
(cd sub &&
git checkout -b ambiguous sub-b &&
@@ -136,8 +135,7 @@ test_expect_success 'merging should fail for ambiguous common parent' '
test_must_fail git merge c 2> actual &&
grep $(cat expect1) actual > /dev/null &&
grep $(cat expect2) actual > /dev/null &&
git reset --hard &&
cd ..
git reset --hard)
'
# in a situation like this
@@ -158,7 +156,7 @@ test_expect_success 'merging should fail for ambiguous common parent' '
# commits (sub-a) does not descend from the submodule merge-base (sub-b).
#
test_expect_success 'merging should fail for changes that are backwards' '
cd merge-search &&
(cd merge-search &&
git checkout -b bb a &&
(cd sub &&
git checkout sub-b) &&
@@ -175,16 +173,13 @@ test_expect_success 'merging should fail for changes that are backwards' '
git commit -a -m "f" &&
git checkout -b test-backward e &&
test_must_fail git merge f &&
cd ..
test_must_fail git merge f)
'
test_expect_success 'merging with a modify/modify conflict between merge bases' '
git reset --hard HEAD &&
git checkout -b test2 c &&
git merge d
'
test_done

2
t/t7406-submodule-update.sh
View File

@@ -25,7 +25,7 @@ test_expect_success 'setup a submodule tree' '
echo file > file &&
git add file &&
test_tick &&
git commit -m upstream
git commit -m upstream &&
git clone . super &&
git clone super submodule &&
git clone super rebasing &&

4
t/t7407-submodule-foreach.sh
View File

@@ -16,7 +16,7 @@ test_expect_success 'setup a submodule tree' '
echo file > file &&
git add file &&
test_tick &&
git commit -m upstream
git commit -m upstream &&
git clone . super &&
git clone super submodule &&
(
@@ -30,7 +30,7 @@ test_expect_success 'setup a submodule tree' '
submodule.sub2 submodule.foo2 &&
git config -f .gitmodules --rename-section \
submodule.sub3 submodule.foo3 &&
git add .gitmodules
git add .gitmodules &&
test_tick &&
git commit -m "submodules" &&
git submodule init sub1 &&