summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-03-25 00:56:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-25 06:01:36 (GMT)
commit06aff47b225506c4603a6f5ec5b4b16aa6a9d7ba (patch)
treebef4b0af1de7ecdc5f8b5b374be4b86e4f654484 /git-merge-ours.sh
parent2a18c266d04273be05ed29c589a5c29b8e68134d (diff)
downloadgit-06aff47b225506c4603a6f5ec5b4b16aa6a9d7ba.zip
git-06aff47b225506c4603a6f5ec5b4b16aa6a9d7ba.tar.gz
git-06aff47b225506c4603a6f5ec5b4b16aa6a9d7ba.tar.bz2
Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
This simplifies the shell code, reduces its memory footprint, and speeds things up. The performance improvements should be noticable when git-rebase works on big commits. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
-rwxr-xr-xgit-merge-ours.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index 4f3d053..2b6a5c0 100755
--- a/git-merge-ours.sh
+++ b/git-merge-ours.sh
@@ -9,6 +9,6 @@
# because the current index is what we will be committing as the
# merge result.
-test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+git-diff-index --quiet --cached HEAD || exit 2
exit 0