diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-17 07:33:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-17 07:33:17 (GMT) |
| commit | 1589e0517fd22c198799504d6888d5a475024152 (patch) | |
| tree | 3686772961b548988c75edbd53de84a97efeb573 | |
| parent | 4287307833a7c67b09973fc1023311e473f830b2 (diff) | |
| parent | 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b (diff) | |
| download | git-1589e0517fd22c198799504d6888d5a475024152.zip git-1589e0517fd22c198799504d6888d5a475024152.tar.gz git-1589e0517fd22c198799504d6888d5a475024152.tar.bz2 | |
Merge branch 'maint'
* maint:
git-merge: finish when git-read-tree fails
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 6ce62c8..8759c5a 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -292,13 +292,13 @@ f,*) # Again the most common case of merging one remote. echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)" git-update-index --refresh 2>/dev/null - new_head=$(git-rev-parse --verify "$1^0") && - git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && msg="Fast forward" if test -n "$have_message" then msg="$msg (no commit created; -m option ignored)" fi + new_head=$(git-rev-parse --verify "$1^0") && + git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && finish "$new_head" "$msg" || exit dropsave exit 0 |