summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 18:39:02 (GMT)
commitf449198e58630b8b57c94e3eeab4927afd7ee03a (patch)
tree50877158a6d9c79514fac50e2cb31af0a9b5c780 /builtin/merge.c
parentdb1d80b8faddc5d5702d79974c5757b464bcbaf6 (diff)
downloadgit-f449198e58630b8b57c94e3eeab4927afd7ee03a.zip
git-f449198e58630b8b57c94e3eeab4927afd7ee03a.tar.gz
git-f449198e58630b8b57c94e3eeab4927afd7ee03a.tar.bz2
coccinelle: convert hashcpy() with null_sha1 to hashclr()
hashcpy with null_sha1 as the source is equivalent to hashclr. In addition to being simpler, using hashclr may give the compiler a chance to optimize better. Convert instances of hashcpy with the source argument of null_sha1 to hashclr. This transformation was implemented using the following semantic patch: @@ expression E1; @@ -hashcpy(E1, null_sha1); +hashclr(E1); Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index b555a1b..a9b99c9 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1530,7 +1530,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* Stash away the local changes so that we can try more than one.
*/
save_state(stash))
- hashcpy(stash, null_sha1);
+ hashclr(stash);
for (i = 0; i < use_strategies_nr; i++) {
int ret;