diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-28 01:14:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-28 23:42:44 (GMT) |
| commit | bf7960eb51a26bcf52f27a60bfcf005661266b1e (patch) | |
| tree | baeef0ee852f787668eceadd7aefa29b79add7a7 /git-octopus.sh | |
| parent | a7928f8ec7fb3c368e6086ab48f41e33a22e1b94 (diff) | |
| download | git-bf7960eb51a26bcf52f27a60bfcf005661266b1e.zip git-bf7960eb51a26bcf52f27a60bfcf005661266b1e.tar.gz git-bf7960eb51a26bcf52f27a60bfcf005661266b1e.tar.bz2 | |
Use git-update-ref in scripts.
This uses the git-update-ref command in scripts for safer updates.
Also places where we used to read HEAD ref by using "cat" were fixed
to use git-rev-parse. This will matter when we start using symbolic
references.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-octopus.sh')
| -rwxr-xr-x | git-octopus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-octopus.sh b/git-octopus.sh index abc6820..d2471af 100755 --- a/git-octopus.sh +++ b/git-octopus.sh @@ -86,5 +86,5 @@ esac result_commit=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD" | git-commit-tree $MRT $PARENT) echo "Committed merge $result_commit" -echo $result_commit >"$GIT_DIR"/HEAD +git-update-ref HEAD $result_commit $head git-diff-tree -p $head $result_commit | git-apply --stat |